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

pythonPackages: use mkPythonDerivation

Browse Source
This commit is contained in:
Frederik Rietdijk
2016-08-31 11:01:16 +02:00
parent e9c4d00cac
commit 4f6b6f1472
13 changed files with 56 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/python-modules/pyqt/4.x.nix
View File

@@ -1,10 +1,10 @@
{ stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus_libs, makeWrapper }:
{ lib, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus_libs, makeWrapper }:
let
version = "4.11.3";
inherit (pythonPackages) python dbus-python sip;
in stdenv.mkDerivation {
name = "${python.libPrefix}-PyQt-x11-gpl-${version}";
inherit (pythonPackages) mkPythonDerivation python dbus-python sip;
in mkPythonDerivation {
name = "$PyQt-x11-gpl-${version}";
src = fetchurl {
url = "mirror://sourceforge/pyqt/PyQt4/PyQt-${version}/PyQt-x11-gpl-${version}.tar.gz";
@@ -31,7 +31,7 @@ in stdenv.mkDerivation {
buildInputs = [ pkgconfig makeWrapper qt4 lndir dbus_libs ];
propagatedBuildInputs = [ sip python ];
propagatedBuildInputs = [ sip ];
postInstall = ''
for i in $out/bin/*; do
@@ -42,7 +42,6 @@ in stdenv.mkDerivation {
enableParallelBuilding = true;
passthru = {
pythonPath = [];
qt = qt4;
};
@@ -50,7 +49,7 @@ in stdenv.mkDerivation {
description = "Python bindings for Qt";
license = "GPL";
homepage = http://www.riverbankcomputing.co.uk;
maintainers = [ stdenv.lib.maintainers.sander ];
platforms = stdenv.lib.platforms.mesaPlatforms;
maintainers = [ lib.maintainers.sander ];
platforms = lib.platforms.mesaPlatforms;
};
}

14
pkgs/development/python-modules/pyqt/5.x.nix
View File

@@ -1,13 +1,13 @@
{ stdenv, fetchurl, pythonPackages, pkgconfig, qtbase, qtsvg, qtwebkit, dbus_libs
{ lib, fetchurl, pythonPackages, pkgconfig, qtbase, qtsvg, qtwebkit, dbus_libs
, lndir, makeWrapper, qmakeHook }:
let
version = "5.6";
inherit (pythonPackages) python dbus-python sip;
in stdenv.mkDerivation {
name = "${python.libPrefix}-PyQt-${version}";
inherit (pythonPackages) mkPythonDerivation python dbus-python sip;
in mkPythonDerivation {
name = "PyQt-${version}";
meta = with stdenv.lib; {
meta = with lib; {
description = "Python bindings for Qt5";
homepage = http://www.riverbankcomputing.co.uk;
license = licenses.gpl3;
@@ -25,7 +25,7 @@ in stdenv.mkDerivation {
qtbase qtsvg qtwebkit dbus_libs qmakeHook
];
propagatedBuildInputs = [ sip python ];
propagatedBuildInputs = [ sip ];
configurePhase = ''
runHook preConfigure
@@ -60,6 +60,4 @@ in stdenv.mkDerivation {
'';
enableParallelBuilding = true;
passthru.pythonPath = [];
}