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

lsb-release: wrap to ensure needed utilities are available #30103

Merged
merged 1 commit into from Nov 2, 2017

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Oct 4, 2017

Motivation for this change

Ensures this tool can be used without specifying other dependencies.

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
    • Linux
  • 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.

buildInputs = [ perl getopt ];
nativeBuildInputs = [ makeWrapper coreutils getopt ];

buildInputs = [ perl ];
Copy link
Contributor

Choose a reason for hiding this comment

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

perl is native (runs when building), coreutils and getopt are target (run where this package is supposed to run).

Copy link
Member Author

Choose a reason for hiding this comment

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

Whoops! Fixed, thanks!

@orivej
Copy link
Contributor

orivej commented Oct 6, 2017

Is it supposed to print LSB Version: n/a? (I have tested on NixOS and Ubuntu.)

@dtzWill
Copy link
Member Author

dtzWill commented Oct 6, 2017

Not sure! But that's what it already does so I figured that was intentional:

$ nix-shell -p lsb-release --run "lsb_release -a"
LSB Version:	n/a
Distributor ID:	n/a
Description:	(none)
Release:	n/a
Codename:	n/a

Maybe it needs to be N/A for reproducibility?

Copy link
Contributor

@orivej orivej left a comment

Choose a reason for hiding this comment

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

OK.

@orivej orivej merged commit a41342b into NixOS:master Nov 2, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants