From 8963dae3430b0b74cea0fd143d94dba442d5e14c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 18 Oct 2016 17:17:12 +0200
Subject: [PATCH] z3: use python2

---
 pkgs/applications/science/logic/z3/default.nix   | 16 +++++++++-------
 .../science/logic/z3_opt/default.nix             | 16 +++++++++-------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix
index 43ce46b8e7a0..0e43abdd681d 100644
--- a/pkgs/applications/science/logic/z3/default.nix
+++ b/pkgs/applications/science/logic/z3/default.nix
@@ -1,6 +1,8 @@
-{ stdenv, fetchFromGitHub, python }:
+{ stdenv, fetchFromGitHub, python2 }:
 
-stdenv.mkDerivation rec {
+let
+  python = python2;
+in stdenv.mkDerivation rec {
   name = "z3-${version}";
   version = "4.4.1";
 
@@ -14,21 +16,21 @@ stdenv.mkDerivation rec {
   buildInputs = [ python ];
   enableParallelBuilding = true;
 
-  configurePhase = "python scripts/mk_make.py --prefix=$out && cd build";
+  configurePhase = "${python.interpreter} scripts/mk_make.py --prefix=$out && cd build";
 
   # z3's install phase is stupid because it tries to calculate the
   # python package store location itself, meaning it'll attempt to
   # write files into the nix store, and fail.
   soext = if stdenv.system == "x86_64-darwin" then ".dylib" else ".so";
   installPhase = ''
-    mkdir -p $out/bin $out/lib/${python.libPrefix}/site-packages $out/include
+    mkdir -p $out/bin $out/${python.sitePackages} $out/include
     cp ../src/api/z3*.h       $out/include
     cp ../src/api/c++/z3*.h   $out/include
     cp z3                     $out/bin
     cp libz3${soext}          $out/lib
-    cp libz3${soext}          $out/lib/${python.libPrefix}/site-packages
-    cp z3*.pyc                $out/lib/${python.libPrefix}/site-packages
-    cp ../src/api/python/*.py $out/lib/${python.libPrefix}/site-packages
+    cp libz3${soext}          $out/${python.sitePackages}
+    cp z3*.pyc                $out/${python.sitePackages}
+    cp ../src/api/python/*.py $out/${python.sitePackages}
   '';
 
   meta = {
diff --git a/pkgs/applications/science/logic/z3_opt/default.nix b/pkgs/applications/science/logic/z3_opt/default.nix
index b4d8fbc95298..1b989097758e 100644
--- a/pkgs/applications/science/logic/z3_opt/default.nix
+++ b/pkgs/applications/science/logic/z3_opt/default.nix
@@ -1,8 +1,10 @@
-{ stdenv, fetchFromGitHub, python }:
+{ stdenv, fetchFromGitHub, python2 }:
 
 # Copied shamelessly from the normal z3 .nix
 
-stdenv.mkDerivation rec {
+let
+  python = python2;
+in stdenv.mkDerivation rec {
   name = "z3_opt-${version}";
   version = "4.3.2";
 
@@ -16,21 +18,21 @@ stdenv.mkDerivation rec {
   buildInputs = [ python ];
   enableParallelBuilding = true;
 
-  configurePhase = "python scripts/mk_make.py --prefix=$out && cd build";
+  configurePhase = "${python.interpreter} scripts/mk_make.py --prefix=$out && cd build";
 
   # z3's install phase is stupid because it tries to calculate the
   # python package store location itself, meaning it'll attempt to
   # write files into the nix store, and fail.
   soext = if stdenv.system == "x86_64-darwin" then ".dylib" else ".so";
   installPhase = ''
-    mkdir -p $out/bin $out/lib/${python.libPrefix}/site-packages $out/include
+    mkdir -p $out/bin $out/${python.sitePackages} $out/include
     cp ../src/api/z3*.h       $out/include
     cp ../src/api/c++/z3*.h   $out/include
     cp z3                     $out/bin
     cp libz3${soext}          $out/lib
-    cp libz3${soext}          $out/lib/${python.libPrefix}/site-packages
-    cp z3*.pyc                $out/lib/${python.libPrefix}/site-packages
-    cp ../src/api/python/*.py $out/lib/${python.libPrefix}/site-packages
+    cp libz3${soext}          $out/${python.sitePackages}
+    cp z3*.pyc                $out/${python.sitePackages}
+    cp ../src/api/python/*.py $out/${python.sitePackages}
   '';
 
   meta = {