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

udisks2: add gobjectIntrospection to nativeBuildInputs #35476

Merged
merged 1 commit into from Feb 25, 2018

Conversation

jfrankenau
Copy link
Member

Motivation for this change

Same as in #35335.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@jtojnar
Copy link
Contributor

jtojnar commented Feb 24, 2018

In this case the GIR file is 1.3 MB so it should go to a dev output.

@jfrankenau
Copy link
Member Author

Done.

@@ -38,6 +39,11 @@ stdenv.mkDerivation rec {
"--with-udevdir=$(out)/lib/udev"
];

makeFlags = [
"INTROSPECTION_GIRDIR=$(out)/share/gir-1.0"
Copy link
Contributor

Choose a reason for hiding this comment

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

The GIR file is moved in gobjectIntrospection setup hook but we should still use dev instead of out here.

Copy link
Member Author

Choose a reason for hiding this comment

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

Ah, missed that one. Should be fixed now.

@jtojnar jtojnar merged commit 2cc5ac2 into NixOS:master Feb 25, 2018
@jfrankenau jfrankenau deleted the udisks2-gobjectIntrospection branch February 25, 2018 20:47
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.

None yet

3 participants