diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-03-21 13:01:17 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-03-21 13:01:49 +0100 |
| commit | 3760c8c7fde6e8b15d19b063579d05018fc2d8b3 (patch) | |
| tree | b081b03bcb4bc6f9de14a96c185e4731a64355d5 /pkgs/development/python-modules/pyqt | |
| parent | 1b0d9e9ae64b677c09f345f740f5a94fa41eb468 (diff) | |
| download | nixlib-3760c8c7fde6e8b15d19b063579d05018fc2d8b3.tar nixlib-3760c8c7fde6e8b15d19b063579d05018fc2d8b3.tar.gz nixlib-3760c8c7fde6e8b15d19b063579d05018fc2d8b3.tar.bz2 nixlib-3760c8c7fde6e8b15d19b063579d05018fc2d8b3.tar.lz nixlib-3760c8c7fde6e8b15d19b063579d05018fc2d8b3.tar.xz nixlib-3760c8c7fde6e8b15d19b063579d05018fc2d8b3.tar.zst nixlib-3760c8c7fde6e8b15d19b063579d05018fc2d8b3.zip | |
Python: replace mkPythonDerivation with buildPythonPackage and format="other";
This way all Python packages use the same function, `buildPythonPackage`.
Diffstat (limited to 'pkgs/development/python-modules/pyqt')
| -rw-r--r-- | pkgs/development/python-modules/pyqt/4.x.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/python-modules/pyqt/5.x.nix | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index dc3dd69ac02e..a5ae0aaa137d 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -2,9 +2,10 @@ let version = "4.12"; - inherit (pythonPackages) mkPythonDerivation python dbus-python sip; -in mkPythonDerivation { + inherit (pythonPackages) buildPythonPackage python dbus-python sip; +in buildPythonPackage { name = "PyQt-x11-gpl-${version}"; + format = "other"; src = fetchurl { url = "mirror://sourceforge/pyqt/PyQt4_gpl_x11-${version}.tar.gz"; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index ee3419eed0e9..880edfbab079 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -3,9 +3,10 @@ let version = "5.8.1"; - inherit (pythonPackages) mkPythonDerivation python dbus-python sip; -in mkPythonDerivation { + inherit (pythonPackages) buildPythonPackage python dbus-python sip; +in buildPythonPackage { name = "PyQt-${version}"; + format = "other"; meta = with lib; { description = "Python bindings for Qt5"; |