parent
79008f6095
commit
c161258003
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, python, pkgconfig, qtbase, qtsvg, qtwebkit, sip, pythonDBus
|
||||
, lndir, makeWrapper }:
|
||||
, lndir, makeWrapper, qmakeHook }:
|
||||
|
||||
let
|
||||
version = "5.5.1";
|
||||
@ -21,13 +21,12 @@ in stdenv.mkDerivation {
|
||||
|
||||
buildInputs = [
|
||||
python pkgconfig makeWrapper lndir
|
||||
qtbase qtsvg qtwebkit
|
||||
qtbase qtsvg qtwebkit qmakeHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ sip ];
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
mkdir -p $out
|
||||
lndir ${pythonDBus} $out
|
||||
|
||||
@ -45,7 +44,6 @@ in stdenv.mkDerivation {
|
||||
--destdir=$out/lib/${python.libPrefix}/site-packages \
|
||||
--sipdir=$out/share/sip \
|
||||
--designer-plugindir=$out/plugins/designer
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
@ -166,10 +166,9 @@ in modules // {
|
||||
pythonPackages = self;
|
||||
};
|
||||
|
||||
pyqt5 = callPackage ../development/python-modules/pyqt/5.x.nix {
|
||||
pyqt5 = pkgs.qt55.callPackage ../development/python-modules/pyqt/5.x.nix {
|
||||
sip = self.sip_4_16;
|
||||
pythonDBus = self.dbus;
|
||||
inherit (pkgs.qt55) qtbase qtsvg qtwebkit;
|
||||
};
|
||||
|
||||
pyside = callPackage ../development/python-modules/pyside { };
|
||||
|
Loading…
Reference in New Issue
Block a user