Merge branch 'master' to resolve conflicts

2016-05-05 08:25:38 +02:00
parent 7d7a9df360 df310048e5
commit 7a005601d4
893 changed files with 89619 additions and 32353 deletions
@@ -22,7 +22,8 @@ stdenv.mkDerivation rec {

  propagatedBuildInputs = [ zlib findXMLCatalogs ];

-  configureFlags = lib.optional supportPython "--with-python=${python}";
+  configureFlags = lib.optional supportPython "--with-python=${python}"
+    ++ [ "--exec_prefix=$dev" ];

  enableParallelBuilding = true;