Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libayatana-common: Enable Lomiri features #262118

Merged

Conversation

OPNA2608
Copy link
Contributor

@OPNA2608 OPNA2608 commented Oct 19, 2023

Description of changes

Working towards #99090.

Enable Lomiri features in libayatana-common. This will make even vanilla Ayatana indicators depend on LUD whose GUI tool depends on LUITK, which is not great for closure size: 61.4M -> 847.9M. We can introduce a lib output to LUD with only the library, which would solve this and bring it down to 61.5M, but I haven't tested if I moved everything correctly with that change or if something might break somewhere - I needed to moveToOutput afew things out of lib.

I plan to revisit this once Lomiri is far enough to build & launch into the DE on master, at which point testing the fallout of that should be easier for me. With nothing outside of Lomiri currently using libayatana-common anyway, this shouldn't be a problem for now. I've taken note of this in the Lomiri tracking issue.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/3246

@OPNA2608
Copy link
Contributor Author

nixpkgs-reviews were deleted but ACK that libayatana-common -> lomiri.lomiri-url-dispatcher -> lomiri.lomiri-app-launch -> lomiri.lomiri-api is failing due to missing includes, needs https://gitlab.com/ubports/development/core/lomiri-api/-/commit/029b42a9b4d5467951595dff8bc536eb5a9e3ef7 (sigh).

@OPNA2608 OPNA2608 marked this pull request as draft January 12, 2024 18:17
@wineee
Copy link
Member

wineee commented Jan 12, 2024

I found that it was a network proxy problem that caused the dependency download to fail, so I deleted the previous nixpkgs-review.

@OPNA2608
Copy link
Contributor Author

Hmm, well I reran nixpkgs-review locally, and it complained when building lomiri.lomiri-api:

In file included from /build/source/include/lomiri/util/GlibMemory.h:28,
                 from /build/source/test/gtest/lomiri/util/GlibMemory/GlibMemory_test.cpp:19:
/build/source/include/lomiri/util/ResourcePtr.h: In member function 'R lomiri::util::ResourcePtr<R, D>::release()':
/build/source/include/lomiri/util/ResourcePtr.h:390:20: error: 'logic_error' is not a member of 'std'
  390 |         throw std::logic_error("release() called on ResourcePtr without resource");
      |                    ^~~~~~~~~~~
/build/source/include/lomiri/util/ResourcePtr.h:23:1: note: 'std::logic_error' is defined in header '<stdexcept>'; did you forget to '#include <stdexcept>'?
   22 | #include <mutex>
  +++ |+#include <stdexcept>
   23 | #include <type_traits>

So you can save yourself a nixpkgs-review, the PR is borked as-is until lomiri.lomiri-api is fixed. 😅

@OPNA2608

This comment was marked as resolved.

@OPNA2608 OPNA2608 force-pushed the init/lomiri/libayatana-common_lomiri_features branch from d89d7aa to 2e7ed08 Compare January 14, 2024 17:21
@OPNA2608 OPNA2608 marked this pull request as ready for review January 14, 2024 17:21
@OPNA2608
Copy link
Contributor Author

Builds fine again.

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
Result of nixpkgs-review pr 262118 run on x86_64-linux 1

1 package built:
  • libayatana-common

@ghost ghost merged commit 2e269dc into NixOS:master Jan 18, 2024
23 checks passed
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants