about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-11-04 08:46:30 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2018-11-04 08:46:30 +0100
commit64d50a00991983e90d6a22f39d03b028602e34d6 (patch)
tree76f17f0af91ec496ef3a8f8ab022e6c6f5fa5c59
parent64e19fdedae3abd589c0429da7e6ec4918d83e8b (diff)
downloadnixlib-64d50a00991983e90d6a22f39d03b028602e34d6.tar
nixlib-64d50a00991983e90d6a22f39d03b028602e34d6.tar.gz
nixlib-64d50a00991983e90d6a22f39d03b028602e34d6.tar.bz2
nixlib-64d50a00991983e90d6a22f39d03b028602e34d6.tar.lz
nixlib-64d50a00991983e90d6a22f39d03b028602e34d6.tar.xz
nixlib-64d50a00991983e90d6a22f39d03b028602e34d6.tar.zst
nixlib-64d50a00991983e90d6a22f39d03b028602e34d6.zip
meson: fix building with python 3.7
-rw-r--r--pkgs/development/tools/build-managers/meson/default.nix8
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index 35ae59af617c..ffbcc46bd1a0 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 }:
+{ lib, python3Packages, stdenv, writeTextDir, substituteAll, fetchpatch }:
 
 python3Packages.buildPythonApplication rec {
   version = "0.46.1";
@@ -41,6 +41,12 @@ 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;