mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

Merge pull request #25244 from Mic92/meson

Browse source 
meson: 0.35.0 -> 0.40.0
This commit is contained in:
Jörg Thalheim 2017-04-27 13:22:40 +02:00 committed by GitHub
parent 361812c9a9 785d008511
commit 85add87068
2 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/libraries/libhttpseverywhere/default.nix
View file

@ -1,15 +1,15 @@
{stdenv, fetchurl, gnome3, glib, json_glib, libxml2, libarchive, libsoup, gobjectIntrospection, meson, ninja, pkgconfig, valadoc}:
stdenv.mkDerivation rec {
major = "0.2";
minor = "10";
major = "0.4";
minor = "2";
version = "${major}.${minor}";
name = "libhttpseverywhere-${version}";
src = fetchurl {
url = "mirror://gnome/sources/libhttpseverywhere/${major}/libhttpseverywhere-${version}.tar.xz";
sha256 = "235f5b7f96188d800470871774e31696fbde085b63f65bd71434af8e9e6ac8aa";
sha256 = "0n850a4adsla6di8dylnadg07wblkdl28abrjvk6fzy8a1kjlx02";
};
nativeBuildInputs = [ gnome3.vala valadoc gobjectIntrospection meson ninja pkgconfig ];
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
configurePhase = ''
mkdir build
cd build
meson.py --prefix "$out" ..
meson --prefix "$out" ..
'';
buildPhase = ''

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

@ -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";