diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-04-16 21:11:33 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-04-16 21:13:30 +0300 |
| commit | 16b45ec3da52bf91dea8821d34882dd3afa8a38b (patch) | |
| tree | 80de2f49c97b4c3a2258c62240a2206073ff2afb /pkgs/development/tools/build-managers | |
| parent | c0e58f80748b8fb120f1ff674240c37dcf8396cf (diff) | |
| parent | 333a24a628391137a7283f09498edd5822f12023 (diff) | |
| download | nixpkgs-16b45ec3da52bf91dea8821d34882dd3afa8a38b.tar nixpkgs-16b45ec3da52bf91dea8821d34882dd3afa8a38b.tar.gz nixpkgs-16b45ec3da52bf91dea8821d34882dd3afa8a38b.tar.bz2 nixpkgs-16b45ec3da52bf91dea8821d34882dd3afa8a38b.tar.lz nixpkgs-16b45ec3da52bf91dea8821d34882dd3afa8a38b.tar.xz nixpkgs-16b45ec3da52bf91dea8821d34882dd3afa8a38b.tar.zst nixpkgs-16b45ec3da52bf91dea8821d34882dd3afa8a38b.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts: pkgs/applications/version-management/git-and-tools/git/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/unix-tools.nix
Diffstat (limited to 'pkgs/development/tools/build-managers')
| -rw-r--r-- | pkgs/development/tools/build-managers/gnumake/3.82/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix index 87897017f86..94fa7e7201a 100644 --- a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix @@ -33,6 +33,9 @@ stdenv.mkDerivation { ./construct-command-line.patch ./long-command-line.patch ./darwin-library_search-dylib.patch + + # Fix support for glibc 2.27's glob + ../4.2/glibc-2.27-glob.patch ]; patchFlags = "-p0"; |