mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 15:33:13 +00:00
Merge pull request #210109 from amjoseph-nixpkgs/pr/stdenv/build-gettext-only-once
This commit is contained in:
commit
5fae6b5c74
@ -296,7 +296,7 @@ in
|
|||||||
|
|
||||||
overrides = self: super: {
|
overrides = self: super: {
|
||||||
inherit (prevStage)
|
inherit (prevStage)
|
||||||
ccWrapperStdenv
|
ccWrapperStdenv gettext
|
||||||
gcc-unwrapped coreutils gnugrep
|
gcc-unwrapped coreutils gnugrep
|
||||||
perl gnum4 bison;
|
perl gnum4 bison;
|
||||||
dejagnu = super.dejagnu.overrideAttrs (a: { doCheck = false; } );
|
dejagnu = super.dejagnu.overrideAttrs (a: { doCheck = false; } );
|
||||||
@ -370,7 +370,7 @@ in
|
|||||||
overrides = self: super: rec {
|
overrides = self: super: rec {
|
||||||
inherit (prevStage)
|
inherit (prevStage)
|
||||||
ccWrapperStdenv
|
ccWrapperStdenv
|
||||||
binutils coreutils gnugrep
|
binutils coreutils gnugrep gettext
|
||||||
perl patchelf linuxHeaders gnum4 bison libidn2 libunistring;
|
perl patchelf linuxHeaders gnum4 bison libidn2 libunistring;
|
||||||
${localSystem.libc} = getLibc prevStage;
|
${localSystem.libc} = getLibc prevStage;
|
||||||
gcc-unwrapped =
|
gcc-unwrapped =
|
||||||
|
Loading…
Reference in New Issue
Block a user