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

pycairo: enable for python35 

The patch was taken from FreeBSD, it is also used on debian. see:
https://svnweb.freebsd.org/ports/head/graphics/py3-cairo/files/pycairo-1.10.0-waf-py3_5.patch?revision=401900&view=markup
This commit is contained in:
Alexander Ried 2016-04-26 23:28:39 +02:00 committed by Joachim Fasting
parent d01fd52b8f
commit cf82611351
No known key found for this signature in database
GPG Key ID: 4330820E1E04DCF4
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, python, pkgconfig, cairo, xlibsWrapper, isPyPy, isPy35 }: { stdenv, fetchurl, fetchpatch, python, pkgconfig, cairo, xlibsWrapper, isPyPy, isPy35 }:
if (isPyPy || isPy35) 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 stdenv.mkDerivation rec {
version = "1.10.0"; version = "1.10.0";
name = "${python.libPrefix}-pycairo-${version}"; name = "${python.libPrefix}-pycairo-${version}";
src = if python.is_py3k or false src = if python.is_py3k or false
@ -23,6 +23,8 @@ if (isPyPy || isPy35) then throw "pycairo not supported for interpreter ${python
sha256 = "0xfl1i9dips2nykyg91f5h5r3xpk2hp1js1gq5z0hwjr0in55id4"; sha256 = "0xfl1i9dips2nykyg91f5h5r3xpk2hp1js1gq5z0hwjr0in55id4";
}; };
patch_waf-py3_5 = ./waf-py3_5.patch;
buildInputs = [ python pkgconfig cairo xlibsWrapper ]; buildInputs = [ python pkgconfig cairo xlibsWrapper ];
configurePhase = '' configurePhase = ''
@ -30,6 +32,7 @@ if (isPyPy || isPy35) then throw "pycairo not supported for interpreter ${python
cd $(${python.executable} waf unpack) cd $(${python.executable} waf unpack)
pwd pwd
patch -p1 < ${patch_waf} patch -p1 < ${patch_waf}
${stdenv.lib.optionalString isPy35 "patch -p1 < ${patch_waf-py3_5}"}
) )
${python.executable} waf configure --prefix=$out ${python.executable} waf configure --prefix=$out

10
pkgs/development/python-modules/pycairo/waf-py3_5.patch Normal file
View File

@ -0,0 +1,10 @@
--- a/waflib/Build.py
+++ b/waflib/Build.py
@@ -151,6 +151,7 @@ class BuildContext(Context.Context):
f.close()
self.init_dirs()
def store(self):
+ return
data={}
for x in SAVED_ATTRS:
data[x]=getattr(self,x)