Merge branch 'master' into staging

This commit is contained in:
Domen Kožar
2015-11-11 12:53:36 +01:00
182 changed files with 11579 additions and 1124 deletions

View File

@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, python, pkgconfig, cairo, xlibsWrapper, isPyPy }:
{ stdenv, fetchurl, fetchpatch, python, pkgconfig, cairo, xlibsWrapper, isPyPy, isPy35 }:
if isPyPy then throw "pycairo not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec {
if (isPyPy || isPy35) then throw "pycairo not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec {
version = "1.10.0";
name = "pycairo-${version}";
src = if python.is_py3k or false
@@ -36,4 +36,6 @@ if isPyPy then throw "pycairo not supported for interpreter ${python.executable}
'';
buildPhase = "${python.executable} waf";
installPhase = "${python.executable} waf install";
meta.platforms = stdenv.lib.platforms.linux;
}