colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #96318 from matthewbauer/provide-patchelf-in-native-stdenv

Browse Source 
stdenv/native: provide patchelf on linux
This commit is contained in:
Matthew Bauer 2020-10-30 13:32:13 -05:00 committed by GitHub
commit 989b403c7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/cc-wrapper/default.nix
View File

@ -57,7 +57,7 @@ let
suffixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config;
expand-response-params =
if buildPackages.stdenv.hasCC && buildPackages.stdenv.cc != "/dev/null"
if (buildPackages.stdenv.hasCC or false) && buildPackages.stdenv.cc != "/dev/null"
then import ../expand-response-params { inherit (buildPackages) stdenv; }
else "";

9
pkgs/stdenv/native/default.nix
View File

@ -78,7 +78,7 @@ let
# A function that builds a "native" stdenv (one that uses tools in
# /usr etc.).
makeStdenv =
{ cc, fetchurl, extraPath ? [], overrides ? (self: super: { }) }:
{ cc, fetchurl, extraPath ? [], overrides ? (self: super: { }), extraNativeBuildInputs ? [] }:
import ../generic {
buildPlatform = localSystem;
@ -94,10 +94,10 @@ let
if system == "x86_64-cygwin" then prehookCygwin else
prehookBase;
extraNativeBuildInputs =
if system == "i686-cygwin" then extraNativeBuildInputsCygwin else
extraNativeBuildInputs = extraNativeBuildInputs ++
(if system == "i686-cygwin" then extraNativeBuildInputsCygwin else
if system == "x86_64-cygwin" then extraNativeBuildInputsCygwin else
[];
[]);
initialPath = extraPath ++ path;
@ -163,6 +163,7 @@ in
inherit (prevStage.stdenv) cc fetchurl;
extraPath = [ prevStage.xz ];
overrides = self: super: { inherit (prevStage) xz; };
extraNativeBuildInputs = if localSystem.isLinux then [ prevStage.patchelf ] else [];
};
})