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

pythonPackages: use mkPythonDerivation

Browse Source
This commit is contained in:
Frederik Rietdijk
2016-08-31 11:01:16 +02:00
parent e9c4d00cac
commit 4f6b6f1472
13 changed files with 56 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/python-modules/pycairo/default.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, python, pkgconfig, cairo, xlibsWrapper, isPyPy, isPy35 }:
{ lib, fetchurl, fetchpatch, python, mkPythonDerivation, pkgconfig, cairo, xlibsWrapper, isPyPy, isPy35 }:
if (isPyPy) then throw "pycairo not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec {
if (isPyPy) then throw "pycairo not supported for interpreter ${python.executable}" else mkPythonDerivation rec {
version = "1.10.0";
name = "${python.libPrefix}-pycairo-${version}";
src = if python.is_py3k or false
@@ -32,7 +32,7 @@ if (isPyPy) then throw "pycairo not supported for interpreter ${python.executabl
cd $(${python.executable} waf unpack)
pwd
patch -p1 < ${patch_waf}
${stdenv.lib.optionalString isPy35 "patch -p1 < ${patch_waf-py3_5}"}
${lib.optionalString isPy35 "patch -p1 < ${patch_waf-py3_5}"}
)
${python.executable} waf configure --prefix=$out
@@ -40,5 +40,5 @@ if (isPyPy) then throw "pycairo not supported for interpreter ${python.executabl
buildPhase = "${python.executable} waf";
installPhase = "${python.executable} waf install";
meta.platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
meta.platforms = lib.platforms.linux ++ lib.platforms.darwin;
}