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

Merge pull request #102356 from freezeboy/refactor-pyside-apiextractor

Browse Source 
python3Packages.pyside,python3Packages.pysideTools,python3Packages.pysideShiboken,pysideApiExtractor,pysideGeneratorrunner: remove dependencies to python2
This commit is contained in:
Frederik Rietdijk 2020-11-01 17:02:45 +01:00 committed by GitHub
commit 878bfaa6bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/python-modules/pyside/apiextractor.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl, cmake, libxml2, libxslt, python2, qt4 }: { stdenv, fetchurl, cmake, libxml2, libxslt, python3, qt4 }:
# This derivation does not provide any Python module and should therefore be called via `all-packages.nix`. # This derivation does not provide any Python module and should therefore be called via `all-packages.nix`.
let let
pythonEnv = python2.withPackages(ps: with ps; [ sphinx ]); pythonEnv = python3.withPackages(ps: with ps; [ sphinx ]);
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "pyside-apiextractor-0.10.10"; name = "pyside-apiextractor-0.10.10";
@ -13,7 +13,14 @@ in stdenv.mkDerivation {
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ cmake qt4 pythonEnv libxml2 libxslt ]; outputs = [ "out" "dev" ];
preConfigure = ''
cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
'';
nativeBuildInputs = [ cmake pythonEnv ];
buildInputs = [ qt4 libxml2 libxslt ];
meta = { meta = {
description = "Eases the development of bindings of Qt-based libraries for high level languages by automating most of the process"; description = "Eases the development of bindings of Qt-based libraries for high level languages by automating most of the process";

6
pkgs/development/python-modules/pyside/default.nix
View File

@ -13,6 +13,12 @@ buildPythonPackage rec {
enableParallelBuilding = true; enableParallelBuilding = true;
outputs = [ "out" "dev" ];
preConfigure = ''
cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
'';
nativeBuildInputs = [ cmake pysideGeneratorrunner pysideShiboken qt4 ]; nativeBuildInputs = [ cmake pysideGeneratorrunner pysideShiboken qt4 ];
buildInputs = [ mesa libGL ]; buildInputs = [ mesa libGL ];

13
pkgs/development/python-modules/pyside/generatorrunner.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl, cmake, pysideApiextractor, python2, qt4 }: { stdenv, fetchurl, cmake, pysideApiextractor, python3, qt4 }:
# This derivation does not provide any Python module and should therefore be called via `all-packages.nix`. # This derivation does not provide any Python module and should therefore be called via `all-packages.nix`.
let let
pythonEnv = python2.withPackages(ps: with ps; [ sphinx ]); pythonEnv = python3.withPackages(ps: with ps; [ sphinx ]);
pname = "pyside-generatorrunner"; pname = "pyside-generatorrunner";
version = "0.6.16"; version = "0.6.16";
in stdenv.mkDerivation { in stdenv.mkDerivation {
@ -15,7 +15,14 @@ in stdenv.mkDerivation {
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ cmake pysideApiextractor qt4 pythonEnv ]; outputs = [ "out" "dev" ];
preConfigure = ''
cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
'';
nativeBuildInputs = [ cmake pythonEnv ];
buildInputs = [ pysideApiextractor qt4 ];
meta = { meta = {
description = "Eases the development of binding generators for C++ and Qt-based libraries by providing a framework to help automating most of the process"; description = "Eases the development of binding generators for C++ and Qt-based libraries by providing a framework to help automating most of the process";

3
pkgs/development/python-modules/pyside/shiboken.nix
View File

@ -33,7 +33,10 @@ buildPythonPackage rec {
buildInputs = [ python libxml2 libxslt ]; buildInputs = [ python libxml2 libxslt ];
outputs = [ "out" "dev" ];
preConfigure = '' preConfigure = ''
cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
echo "preConfigure: Fixing shiboken_generator install target." echo "preConfigure: Fixing shiboken_generator install target."
substituteInPlace generator/CMakeLists.txt --replace \ substituteInPlace generator/CMakeLists.txt --replace \
\"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/ \"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/

6
pkgs/development/python-modules/pyside/tools.nix
View File

@ -12,6 +12,12 @@ buildPythonPackage rec {
sha256 = "017i2yxgjrisaifxqnl3ym8ijl63l2yl6a3474dsqhlyqz2nx2ll"; sha256 = "017i2yxgjrisaifxqnl3ym8ijl63l2yl6a3474dsqhlyqz2nx2ll";
}; };
outputs = [ "out" "dev" ];
preConfigure = ''
cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
'';
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ qt4 ]; buildInputs = [ qt4 ];