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

unison-ucm 1.0.M1l-alpha -> 1.0.M1m-alpha #104809

Merged
merged 1 commit into from Nov 30, 2020

Conversation

virusdave
Copy link
Contributor

See title. Also, add missing less to buildInputs.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
dontConfigure = true;

nativeBuildInputs = stdenv.lib.optional (!stdenv.isDarwin) autoPatchelfHook;
buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ ncurses5 zlib gmp ];
buildInputs = [ less ] ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ ncurses5 zlib gmp ]);
Copy link
Member

Choose a reason for hiding this comment

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

Does it really link against less?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

no, but it uses it at runtime, and this is the way i know to make it available in a pure shell.

Better approaches welcomed :)

Copy link
Member

Choose a reason for hiding this comment

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

makeWrapper would be a good fit here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry, I don't follow. A quick glance at both make_wrapper.sh and docs doesn't really help me understand what you mean. Do you have an example you can point me to?

Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah great, thanks! Updated and tested that it works correctly in a pure shell.

@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 104809 run on x86_64-linux 1

1 package built:
  • unison-ucm

@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 104809 run on x86_64-darwin 1

1 package built:
  • unison-ucm

See title.  Also, add missing `less` to buildInputs
@infinisil infinisil merged commit 5420a92 into NixOS:master Nov 30, 2020
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