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

riscv: Use gnumake42HEAD.

Browse Source
This commit is contained in:
Shea Levy 2018-02-19 09:36:53 -05:00
parent fb8a09e8f0
commit 43522dc851
No known key found for this signature in database
GPG Key ID: 5C0BD6957D86FE27
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/build-managers/gnumake/4.2/default.nix
View File

@ -4,8 +4,6 @@ assert guileSupport -> ( pkgconfig != null && guile != null );
let let
version = "4.2.1"; version = "4.2.1";
needGlibcPatch = (stdenv.cc.libc.version or "") == "2.27";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "gnumake-${version}"; name = "gnumake-${version}";
@ -22,7 +20,7 @@ stdenv.mkDerivation {
# included Makefiles, don't look in /usr/include and friends. # included Makefiles, don't look in /usr/include and friends.
./impure-dirs.patch ./impure-dirs.patch
./pselect.patch ./pselect.patch
] ++ stdenv.lib.optional needGlibcPatch ./glibc-2.27.patch; ];
nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ]; nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ];
buildInputs = stdenv.lib.optionals guileSupport [ guile ]; buildInputs = stdenv.lib.optionals guileSupport [ guile ];

4
pkgs/top-level/all-packages.nix
View File

@ -7661,7 +7661,9 @@ with pkgs;
gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { }; gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { };
gnumake3 = gnumake382; gnumake3 = gnumake382;
gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { }; gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { };
gnumake = gnumake42; gnumake = if hostPlatform.isRiscV # Technically this check should be for glibc version.
then gnumake42HEAD
else gnumake42;
gnumake42HEAD = callPackage ../development/tools/build-managers/gnumake/4.2/head.nix { }; gnumake42HEAD = callPackage ../development/tools/build-managers/gnumake/4.2/head.nix { };
gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep {}); gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep {});