diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2016-04-15 04:58:43 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2016-04-15 05:26:02 +0200 |
| commit | f1c2572479265d121d55d9e3270dc1ebfee4aa00 (patch) | |
| tree | 0af4ddd11aebe5ec396728a8cd3e275b2c85f2bb | |
| parent | 96bed5b7aa92157586857255901d29de9ab05723 (diff) | |
| download | nixpkgs-f1c2572479265d121d55d9e3270dc1ebfee4aa00.tar nixpkgs-f1c2572479265d121d55d9e3270dc1ebfee4aa00.tar.gz nixpkgs-f1c2572479265d121d55d9e3270dc1ebfee4aa00.tar.bz2 nixpkgs-f1c2572479265d121d55d9e3270dc1ebfee4aa00.tar.lz nixpkgs-f1c2572479265d121d55d9e3270dc1ebfee4aa00.tar.xz nixpkgs-f1c2572479265d121d55d9e3270dc1ebfee4aa00.tar.zst nixpkgs-f1c2572479265d121d55d9e3270dc1ebfee4aa00.zip | |
pyqt5: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right qmake path. Unfortunately the mkDerivation attributes of pyqt5 override the whole configurePhase, so this hook isn't run at all. This fixes the build of pyqt5 and it now successfully compiles on my machine. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| -rw-r--r-- | pkgs/development/python-modules/pyqt/5.x.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 795019d0b41..b11e87fe1d9 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -27,6 +27,7 @@ in stdenv.mkDerivation { propagatedBuildInputs = [ sip ]; configurePhase = '' + runHook preConfigure mkdir -p $out lndir ${pythonDBus} $out @@ -44,6 +45,7 @@ in stdenv.mkDerivation { --destdir=$out/lib/${python.libPrefix}/site-packages \ --sipdir=$out/share/sip \ --designer-plugindir=$out/plugins/designer + runHook postConfigure ''; postInstall = '' |