public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #50710 from hedning/remove-obsolete-meson-patch

Browse Source 
meson: remove obsolete and blocking patch
This commit is contained in:
Jan Tojnar 2018-11-19 12:32:26 +01:00 committed by GitHub
commit dabc125690
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 {
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;