mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
stdenv: fix stagesNative
This commit is contained in:
parent
8066e45fb3
commit
f829b24045
|
@ -195,9 +195,11 @@ stdenv.mkDerivation (rec {
|
||||||
substituteInPlace "$out"/lib/perl5/*/*/Config_heavy.pl \
|
substituteInPlace "$out"/lib/perl5/*/*/Config_heavy.pl \
|
||||||
--replace "${libcInc}" /no-such-path \
|
--replace "${libcInc}" /no-such-path \
|
||||||
--replace "${
|
--replace "${
|
||||||
if stdenv.hasCC then stdenv.cc.cc else "/no-such-path"
|
if stdenv.hasCC then stdenv.cc else "/no-such-path"
|
||||||
}" /no-such-path \
|
}" /no-such-path \
|
||||||
--replace "${stdenv.cc}" /no-such-path \
|
--replace "${
|
||||||
|
if stdenv.hasCC && stdenv.cc.cc != null then stdenv.cc.cc else "/no-such-path"
|
||||||
|
}" /no-such-path \
|
||||||
--replace "$man" /no-such-path
|
--replace "$man" /no-such-path
|
||||||
'' + lib.optionalString crossCompiling
|
'' + lib.optionalString crossCompiling
|
||||||
''
|
''
|
||||||
|
|
|
@ -152,7 +152,10 @@ in
|
||||||
inherit config overlays;
|
inherit config overlays;
|
||||||
stdenv = makeStdenv {
|
stdenv = makeStdenv {
|
||||||
inherit (prevStage) cc fetchurl;
|
inherit (prevStage) cc fetchurl;
|
||||||
} // { inherit (prevStage) fetchurl; };
|
overrides = prev: final: { inherit (prevStage) fetchurl; };
|
||||||
|
} // {
|
||||||
|
inherit (prevStage) fetchurl;
|
||||||
|
};
|
||||||
})
|
})
|
||||||
|
|
||||||
# Using that, build a stdenv that adds the ‘xz’ command (which most systems
|
# Using that, build a stdenv that adds the ‘xz’ command (which most systems
|
||||||
|
@ -162,7 +165,7 @@ in
|
||||||
stdenv = makeStdenv {
|
stdenv = makeStdenv {
|
||||||
inherit (prevStage.stdenv) cc fetchurl;
|
inherit (prevStage.stdenv) cc fetchurl;
|
||||||
extraPath = [ prevStage.xz ];
|
extraPath = [ prevStage.xz ];
|
||||||
overrides = self: super: { inherit (prevStage) xz; };
|
overrides = self: super: { inherit (prevStage) fetchurl xz; };
|
||||||
extraNativeBuildInputs = if localSystem.isLinux then [ prevStage.patchelf ] else [];
|
extraNativeBuildInputs = if localSystem.isLinux then [ prevStage.patchelf ] else [];
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in a new issue