git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #96318 from matthewbauer/provide-patchelf-in-native-stdenv

stdenv/native: provide patchelf on linux

commit989b403c7feabeaf0dcd62c67670aa6f9f1786a2 authorMatthew Bauer <mjbauer95@gmail.com> dateFri 30 Oct 2020, 13:32 (6 years ago) parent0126c864830967
2 files changed+6−5
compare with master
unifiedsplit
pkgs/build-support/cc-wrapper/default.nix+1−1 pkgs/stdenv/native/default.nix+5−4
pkgs/build-support/cc-wrapper/default.nix+1−1
@@ -57,7 +57,7 @@ let
5757 suffixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config;
5858
5959 expand-response-params =
60− if buildPackages.stdenv.hasCC && buildPackages.stdenv.cc != "/dev/null"
60+ if (buildPackages.stdenv.hasCC or false) && buildPackages.stdenv.cc != "/dev/null"
6161 then import ../expand-response-params { inherit (buildPackages) stdenv; }
6262 else "";
6363
pkgs/stdenv/native/default.nix+5−4
@@ -78,7 +78,7 @@ let
7878 # A function that builds a "native" stdenv (one that uses tools in
7979 # /usr etc.).
8080 makeStdenv =
81− { cc, fetchurl, extraPath ? [], overrides ? (self: super: { }) }:
81+ { cc, fetchurl, extraPath ? [], overrides ? (self: super: { }), extraNativeBuildInputs ? [] }:
8282
8383 import ../generic {
8484 buildPlatform = localSystem;
@@ -94,10 +94,10 @@ let
9494 if system == "x86_64-cygwin" then prehookCygwin else
9595 prehookBase;
9696
97− extraNativeBuildInputs =
98− if system == "i686-cygwin" then extraNativeBuildInputsCygwin else
97+ extraNativeBuildInputs = extraNativeBuildInputs ++
98+ (if system == "i686-cygwin" then extraNativeBuildInputsCygwin else
9999 if system == "x86_64-cygwin" then extraNativeBuildInputsCygwin else
100− [];
100+ []);
101101
102102 initialPath = extraPath ++ path;
103103
@@ -163,6 +163,7 @@ in
163163 inherit (prevStage.stdenv) cc fetchurl;
164164 extraPath = [ prevStage.xz ];
165165 overrides = self: super: { inherit (prevStage) xz; };
166+ extraNativeBuildInputs = if localSystem.isLinux then [ prevStage.patchelf ] else [];
166167 };
167168 })
168169