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

fetchsvn: Fix for cross #82248

Merged
merged 1 commit into from Mar 18, 2020
Merged

Conversation

Ericson2314
Copy link
Member

Motivation for this change

Just use nativeBuildInputs at build time.

Things done
  • 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.

Just use `nativeBuildInputs` at build time.
@@ -32,13 +38,16 @@ else
stdenvNoCC.mkDerivation {
name = name_;
builder = ./builder.sh;
nativeBuildInputs = [ subversion glibcLocales ];
nativeBuildInputs = [ subversion glibcLocales ]
++ stdenvNoCC.lib.optional sshSupport openssh;
Copy link
Member

Choose a reason for hiding this comment

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

Is this necessary, given the next line?

Copy link
Member Author

Choose a reason for hiding this comment

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

Probably not, but I sort of like to explicitly put down deps like that anyways, in case there is or will be a setup hook or something.

Copy link
Member Author

Choose a reason for hiding this comment

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

I'd already merged to master in #82130 So I'll mere this as I have more commits on top, but happy to change this on both branches later if you like.

@Ericson2314 Ericson2314 merged commit 7562a06 into NixOS:release-20.03 Mar 18, 2020
@Ericson2314 Ericson2314 deleted the fetchsvn-cross branch March 18, 2020 21:15
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

2 participants