diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-04 10:16:46 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-04 10:16:46 +0100 |
commit | be964d00ea05aeba33cb45ec29a6662d263cfd71 (patch) | |
tree | 0f555f81e0864187c93e74e7c81ffb4c1348771b /pkgs/development/python-modules/pyqt | |
parent | 66dc266530d5094b86699a25dde8959259c8de84 (diff) | |
download | nixpkgs-be964d00ea05aeba33cb45ec29a6662d263cfd71.tar nixpkgs-be964d00ea05aeba33cb45ec29a6662d263cfd71.tar.gz nixpkgs-be964d00ea05aeba33cb45ec29a6662d263cfd71.tar.bz2 nixpkgs-be964d00ea05aeba33cb45ec29a6662d263cfd71.tar.lz nixpkgs-be964d00ea05aeba33cb45ec29a6662d263cfd71.tar.xz nixpkgs-be964d00ea05aeba33cb45ec29a6662d263cfd71.tar.zst nixpkgs-be964d00ea05aeba33cb45ec29a6662d263cfd71.zip |
python.pkgs.pyqt5: minor improvements
Diffstat (limited to 'pkgs/development/python-modules/pyqt')
-rw-r--r-- | pkgs/development/python-modules/pyqt/5.x.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 54471f64e30..225da204e21 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -13,7 +13,6 @@ in buildPythonPackage { pname = pname; version = version; format = "other"; - name = pname + "-" + version; meta = with lib; { description = "Python bindings for Qt5"; @@ -28,7 +27,7 @@ in buildPythonPackage { sha256 = "0l2zy6b7bfjxmg4bb8yikg6i8iy2xdwmvk7knfmrzfpqbmkycbrl"; }; - nativeBuildInputs = [ pkgconfig makeWrapper qmake ]; + nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ lndir qtbase qtsvg qtwebkit qtwebengine dbus_libs @@ -43,10 +42,10 @@ in buildPythonPackage { lndir ${dbus-python} $out rm -rf "$out/nix-support" - export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages + export PYTHONPATH=$PYTHONPATH:$out/${python.sitePackages} substituteInPlace configure.py \ - --replace 'install_dir=pydbusmoddir' "install_dir='$out/lib/${python.libPrefix}/site-packages/dbus/mainloop'" \ + --replace 'install_dir=pydbusmoddir' "install_dir='$out/${python.sitePackages}/dbus/mainloop'" \ --replace "ModuleMetadata(qmake_QT=['webkitwidgets'])" "ModuleMetadata(qmake_QT=['webkitwidgets', 'printsupport'])" ${python.executable} configure.py -w \ |