cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

meson: remove obsolete and blocking patch

Browse source 
meson is now upgraded to 0.48.2 which includes the patch causing the build to
fail.
This commit is contained in:
Tor Hedin Brønner 2018-11-19 12:11:06 +01:00
parent dfa36eda92
commit 7a48c7ccf8
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/tools/build-managers/meson/default.nix
View file

@ -1,4 +1,4 @@
{ lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages, fetchpatch }: { lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
version = "0.48.2"; version = "0.48.2";
@ -44,12 +44,6 @@ python3Packages.buildPythonApplication rec {
src = ./fix-rpath.patch; src = ./fix-rpath.patch;
inherit (builtins) storeDir; 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; setupHook = ./setup-hook.sh;