diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/stdenv/native/default.nix')
| -rw-r--r-- | infra/libkookie/nixpkgs/pkgs/stdenv/native/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/stdenv/native/default.nix b/infra/libkookie/nixpkgs/pkgs/stdenv/native/default.nix index f6e0df161ad0..b79b81253ad5 100644 --- a/infra/libkookie/nixpkgs/pkgs/stdenv/native/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/stdenv/native/default.nix @@ -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 []; }; }) |