ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 14:22:50 +03:00
Code Issues Projects Releases Wiki Activity

Use gnumakeNix' instead of gnumake' in `stdenv'.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13056
This commit is contained in:
Ludovic Courtès 2008-10-13 09:06:04 +00:00
parent 64a6c823fc
commit 36debce744
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/stdenv/common-path.nix
View File

@ -8,7 +8,7 @@
pkgs.gnutar pkgs.gnutar
pkgs.gzip pkgs.gzip
pkgs.bzip2 pkgs.bzip2
pkgs.gnumake pkgs.gnumakeNix
pkgs.bash pkgs.bash
pkgs.patch pkgs.patch
pkgs.replace pkgs.replace

2
pkgs/stdenv/linux/default.nix
View File

@ -217,7 +217,7 @@ rec {
inherit (stdenvLinuxBoot2Pkgs) binutils /* gcc */ glibc; inherit (stdenvLinuxBoot2Pkgs) binutils /* gcc */ glibc;
inherit (stdenvLinuxBoot3Pkgs) inherit (stdenvLinuxBoot3Pkgs)
gzip bzip2 bash coreutils diffutils findutils gawk gzip bzip2 bash coreutils diffutils findutils gawk
gnumake gnused gnutar gnugrep patch patchelf gnumakeNix gnused gnutar gnugrep patch patchelf
attr acl; attr acl;
}; };
}; };

4
pkgs/stdenv/linux/make-bootstrap-tools.nix
View File

@ -10,7 +10,7 @@ let
# dietlibc. # dietlibc.
pkgsToRemove = pkgsToRemove =
[ "binutils" "gcc" "coreutils" "findutils" "diffutils" "gnused" "gnugrep" [ "binutils" "gcc" "coreutils" "findutils" "diffutils" "gnused" "gnugrep"
"gawk" "gnutar" "gzip" "bzip2" "gnumake" "bash" "patch" "patchelf" "gawk" "gnutar" "gzip" "bzip2" "gnumakeNix" "bash" "patch" "patchelf"
]; ];
pkgsDiet = import ../../top-level/all-packages.nix { pkgsDiet = import ../../top-level/all-packages.nix {
@ -28,7 +28,7 @@ let
inherit (pkgsDiet) inherit (pkgsDiet)
coreutils diffutils gnugrep coreutils diffutils gnugrep
gzip bzip2 gnumake bash patch binutils curl; gzip bzip2 gnumakeNix bash patch binutils curl;
findutils = pkgsDiet.findutils4227; # 4.2.28 is broken findutils = pkgsDiet.findutils4227; # 4.2.28 is broken

2
pkgs/stdenv/mingw/pkgs/default.nix
View File

@ -150,7 +150,7 @@ rec {
pkgs.gnutar pkgs.gnutar
pkgs.gzip pkgs.gzip
pkgs.bzip2 pkgs.bzip2
pkgs.gnumake pkgs.gnumakeNix
pkgs.bash pkgs.bash
pkgs.patch pkgs.patch
*/ */