diff options
author | Shea Levy <shea@shealevy.com> | 2018-02-19 09:36:53 -0500 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2018-02-19 09:36:53 -0500 |
commit | 43522dc85187b9941aa13ede6d271cf1cb70e28a (patch) | |
tree | 93fd2c0b60a9e44a1d010ef57ecb3deae7cad75e /pkgs/development/tools/build-managers/gnumake/4.2/default.nix | |
parent | fb8a09e8f0bf3eedcea908b89b4769094857a446 (diff) | |
download | nixpkgs-43522dc85187b9941aa13ede6d271cf1cb70e28a.tar nixpkgs-43522dc85187b9941aa13ede6d271cf1cb70e28a.tar.gz nixpkgs-43522dc85187b9941aa13ede6d271cf1cb70e28a.tar.bz2 nixpkgs-43522dc85187b9941aa13ede6d271cf1cb70e28a.tar.lz nixpkgs-43522dc85187b9941aa13ede6d271cf1cb70e28a.tar.xz nixpkgs-43522dc85187b9941aa13ede6d271cf1cb70e28a.tar.zst nixpkgs-43522dc85187b9941aa13ede6d271cf1cb70e28a.zip |
riscv: Use gnumake42HEAD.
Diffstat (limited to 'pkgs/development/tools/build-managers/gnumake/4.2/default.nix')
-rw-r--r-- | pkgs/development/tools/build-managers/gnumake/4.2/default.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index 1094cacb7af..e175205143f 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -4,8 +4,6 @@ assert guileSupport -> ( pkgconfig != null && guile != null ); let version = "4.2.1"; - - needGlibcPatch = (stdenv.cc.libc.version or "") == "2.27"; in stdenv.mkDerivation { name = "gnumake-${version}"; @@ -22,7 +20,7 @@ stdenv.mkDerivation { # included Makefiles, don't look in /usr/include and friends. ./impure-dirs.patch ./pselect.patch - ] ++ stdenv.lib.optional needGlibcPatch ./glibc-2.27.patch; + ]; nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ]; buildInputs = stdenv.lib.optionals guileSupport [ guile ]; |