1 files changed, 32 insertions, 10 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix
index c5561525db50..cf7192f92ffb 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix
@@ -1,24 +1,42 @@
-{ lib, fetchurl, cmake, buildPythonPackage, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35, isPy36, isPy37 }:
+{ lib, fetchFromGitHub, buildPythonPackage
+, cmake
+, isPy35
+, isPy36
+, isPy37
+, isPy3k
+, libxml2
+, libxslt
+, pkg-config
+, pysideApiextractor
+, pysideGeneratorrunner
+, python
+, qt4
+, sphinx
+}:
 
-# This derivation provides a Python module and should therefore be called via `python-packages.nix`.
-# Python 3.5 is not supported: https://github.com/PySide/Shiboken/issues/77
 buildPythonPackage rec {
   pname = "pyside-shiboken";
   version = "1.2.4";
-
   format = "other";
+  disabled = !isPy3k;
 
-  src = fetchurl {
-    url = "https://github.com/PySide/Shiboken/archive/${version}.tar.gz";
-    sha256 = "1536f73a3353296d97a25e24f9554edf3e6a48126886f8d21282c3645ecb96a4";
+  src = fetchFromGitHub {
+    owner = "PySide";
+    repo = "Shiboken";
+    rev = version;
+    sha256 = "0x2lyg52m6a0vn0665pgd1z1qrydglyfxxcggw6xzngpnngb6v5v";
   };
 
-
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ cmake libxml2 libxslt pysideApiextractor pysideGeneratorrunner python sphinx qt4 ];
+  nativeBuildInputs = [ cmake pkg-config pysideApiextractor pysideGeneratorrunner sphinx qt4 ];
+
+  buildInputs = [ python libxml2 libxslt ];
+
+  outputs = [ "out" "dev" ];
 
   preConfigure = ''
+    cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
     echo "preConfigure: Fixing shiboken_generator install target."
     substituteInPlace generator/CMakeLists.txt --replace \
       \"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/
@@ -27,7 +45,11 @@ buildPythonPackage rec {
   # gcc6 patch was also sent upstream: https://github.com/pyside/Shiboken/pull/86
   patches = [ ./gcc6.patch ] ++ (lib.optional (isPy35 || isPy36 || isPy37) ./shiboken_py35.patch);
 
-  cmakeFlags = lib.optional isPy3k "-DUSE_PYTHON3=TRUE";
+  cmakeFlags = lib.optionals isPy3k [
+    "-DUSE_PYTHON3=TRUE"
+    "-DPYTHON3_INCLUDE_DIR=${lib.getDev python}/include/${python.libPrefix}"
+    "-DPYTHON3_LIBRARY=${lib.getLib python}/lib"
+  ];
 
   meta = {
     description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code";