diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2016-04-15 03:44:57 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2016-04-15 05:26:02 +0200 |
| commit | 2d6ea2cc3072f9bd86d655bf7e614d556ee0b339 (patch) | |
| tree | cba20fdb67b135ae8fa3ad26eac49a6e1e857f4a /pkgs | |
| parent | 5c7131213e6529bced8a6426245a3ed968a19d3c (diff) | |
qmltermwidget: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right qmake path. Unfortunately the mkDerivation attributes of qmltermwidget override the whole configurePhase, so this hook isn't run at all. This fixes the build of qmltermwidget and it now successfully compiles on my machine. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/qmltermwidget/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 64d8570460cb5..359a4341537dc 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -17,7 +17,11 @@ stdenv.mkDerivation rec { --replace '$$[QT_INSTALL_QML]' "/lib/qt5/qml/" ''; - configurePhase = "qmake PREFIX=$out"; + configurePhase = '' + runHook preConfigure + qmake PREFIX=$out + runHook postConfigure + ''; installPhase=''make INSTALL_ROOT="$out" install''; |