upower, power-profiles-daemon: Fix GI_TYPELIB_PATH for tests #182687
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 tasks
|
Note that this includes #182668 that fixes |
|
Looks like |
YorikSar
changed the title
|
Do not like it very much but I guess it is an okay workaround until it is fixed properly. cc @Artturin |
|
Im checking it out, do not merge yet |
Artturin
reviewed
Jul 24, 2022
Artturin
reviewed
Jul 24, 2022
gobject-introspection doesn't handle checkInputs since NixOS#177538, so tests couldn't find UMockdev namespace. Added umockdev to buildInputs.
gobject-introspection doesn't handle checkInputs since NixOS#177538. Added umockdev to buildInputs.
|
This broke cross-compilation for upower since umockdev doesn't cross-compile properly. I'll take a quick look to see if it's easily fixable. Edit: it seems an issue related to the gobject fixes Artturin has looked into lately Lazy fix here: diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix
index 60d74f43b6a..6069a7bf154 100644
--- a/pkgs/development/libraries/umockdev/default.nix
+++ b/pkgs/development/libraries/umockdev/default.nix
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
pname = "umockdev";
version = "0.17.13";
- outputs = [ "bin" "out" "dev" "devdoc" ];
+ outputs = [ "bin" "out" "dev" ]
+ ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) "devdoc";
src = fetchurl {
url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz";
@@ -45,6 +46,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
+ gobject-introspection
glib
systemd
libgudev
@@ -58,7 +60,7 @@ stdenv.mkDerivation rec {
];
mesonFlags = [
- "-Dgtk_doc=true"
+ "-Dgtk_doc=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}"
];
doCheck = true; |
|
Proper fix is to use |
|
Oh! I thought it wasn't using meson, guess I'm a bit tired. Thanks. |
|
i'll send the fix to staging-next because I changed the logic of mesonEmulatorHook throw and if I add mesonEmulatorHook to it on master then when staging-next is merged there will be a throw |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
gobject-introspection doesn't handle checkInputs since #177538, so tests couldn't find UMockdev namespace. Added umockdev to buildInputs.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes