about summary refs log tree commit diff
path: root/pkgs/development/tools/build-managers/meson
diff options
context:
space:
mode:
authorTor Hedin Brønner <torhedinbronner@gmail.com>2018-11-19 12:11:06 +0100
committerTor Hedin Brønner <torhedinbronner@gmail.com>2018-11-19 12:11:06 +0100
commit7a48c7ccf8209bf16ab3516e6e7ffb0c415305ae (patch)
tree501c30d44779a293505a3c53e953c5ace3e3723e /pkgs/development/tools/build-managers/meson
parentdfa36eda92000085e066883bb9b7f060a2915863 (diff)
downloadnixlib-7a48c7ccf8209bf16ab3516e6e7ffb0c415305ae.tar
nixlib-7a48c7ccf8209bf16ab3516e6e7ffb0c415305ae.tar.gz
nixlib-7a48c7ccf8209bf16ab3516e6e7ffb0c415305ae.tar.bz2
nixlib-7a48c7ccf8209bf16ab3516e6e7ffb0c415305ae.tar.lz
nixlib-7a48c7ccf8209bf16ab3516e6e7ffb0c415305ae.tar.xz
nixlib-7a48c7ccf8209bf16ab3516e6e7ffb0c415305ae.tar.zst
nixlib-7a48c7ccf8209bf16ab3516e6e7ffb0c415305ae.zip
meson: remove obsolete and blocking patch
meson is now upgraded to 0.48.2 which includes the patch causing the build to
fail.
Diffstat (limited to 'pkgs/development/tools/build-managers/meson')
-rw-r--r--pkgs/development/tools/build-managers/meson/default.nix8
1 files changed, 1 insertions, 7 deletions
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index 118a7681c3ac..13f61fb16177 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -1,4 +1,4 @@
-{ lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages, fetchpatch }:
+{ lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages }:
 
 python3Packages.buildPythonApplication rec {
   version = "0.48.2";
@@ -44,12 +44,6 @@ python3Packages.buildPythonApplication rec {
       src = ./fix-rpath.patch;
       inherit (builtins) storeDir;
     })
-
-    # Support Python 3.7. This is part of 0.47 and 0.48.1.
-    (fetchpatch {
-      url = https://github.com/mesonbuild/meson/commit/a87496addd9160300837aa50193f4798c6f1d251.patch;
-      sha256 = "1jfn9dgib5bc8frcd65cxn3fzhp19bpbjadxjkqzbjk1v4hdbl88";
-    })
   ];
 
   setupHook = ./setup-hook.sh;