diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2017-04-26 16:35:11 +0200 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2017-04-26 16:41:49 +0200 |
commit | 0ee8160aa457507c89b1f42a763d3c16c9373970 (patch) | |
tree | e76f92418ba205635cd37a8f89debea02b151c17 | |
parent | 9d3c1183203fc8494fb68bb77193bf85c4c7a874 (diff) | |
download | nixpkgs-0ee8160aa457507c89b1f42a763d3c16c9373970.tar nixpkgs-0ee8160aa457507c89b1f42a763d3c16c9373970.tar.gz nixpkgs-0ee8160aa457507c89b1f42a763d3c16c9373970.tar.bz2 nixpkgs-0ee8160aa457507c89b1f42a763d3c16c9373970.tar.lz nixpkgs-0ee8160aa457507c89b1f42a763d3c16c9373970.tar.xz nixpkgs-0ee8160aa457507c89b1f42a763d3c16c9373970.tar.zst nixpkgs-0ee8160aa457507c89b1f42a763d3c16c9373970.zip |
meson: 0.35.0 -> 0.40.0
In configured builds other tools tries to call meson by directly passing meson tools directly to python. Since they were shell scripts due wrapping this failed
-rw-r--r-- | pkgs/development/tools/build-managers/meson/default.nix | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 558b8acf70f..d4dbc6b46d2 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,13 +1,23 @@ -{ lib, python3Packages, fetchurl }: -python3Packages.buildPythonPackage rec { - version = "0.35.0"; - name = "meson-${version}"; +{ lib, python3Packages }: +python3Packages.buildPythonApplication rec { + version = "0.40.0"; + pname = "meson"; + name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/m/meson/${name}.tar.gz"; - sha256 = "0w4vian55cwcv2m5qzn73aznf9a0y24cszqb7dkpahrb9yrg25l3"; + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "1hb6y5phzd5738rlpz78w8hfzk7sbxj81551mb7bbkkqz8ql1gjw"; }; + postFixup = '' + pushd $out/bin + # undo shell wrapper as meson tools are called with python + for i in *; do + mv ".$i-wrapped" "$i" + done + popd + ''; + meta = with lib; { homepage = http://mesonbuild.com; description = "SCons-like build system that use python as a front-end language and Ninja as a building backend"; |