diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-16 23:02:33 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-20 18:55:51 +0300 |
| commit | 005dab1a7afee27358e011906231ad7eed7c4120 (patch) | |
| tree | f82a7536f74c54706ec7afa90e263020629478d1 /pkgs/development/libraries/qmltermwidget | |
| parent | 49558b04d256c1010c76b3491e84f3c1e1db7a98 (diff) | |
| download | nixpkgs-005dab1a7afee27358e011906231ad7eed7c4120.tar nixpkgs-005dab1a7afee27358e011906231ad7eed7c4120.tar.gz nixpkgs-005dab1a7afee27358e011906231ad7eed7c4120.tar.bz2 nixpkgs-005dab1a7afee27358e011906231ad7eed7c4120.tar.lz nixpkgs-005dab1a7afee27358e011906231ad7eed7c4120.tar.xz nixpkgs-005dab1a7afee27358e011906231ad7eed7c4120.tar.zst nixpkgs-005dab1a7afee27358e011906231ad7eed7c4120.zip | |
qmltermwidget: move to qmakeHook
This reverts commit 2d6ea2cc3072f9bd86d655bf7e614d556ee0b339.
Diffstat (limited to 'pkgs/development/libraries/qmltermwidget')
| -rw-r--r-- | pkgs/development/libraries/qmltermwidget/default.nix | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 359a4341537..1620649a3cc 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, qtbase, qtquick1 }: +{ stdenv, fetchgit, qtbase, qtquick1, qmakeHook }: stdenv.mkDerivation rec { version = "0.1.0"; @@ -11,19 +11,14 @@ stdenv.mkDerivation rec { }; buildInputs = [ qtbase qtquick1 ]; + nativeBuildInputs = [ qmakeHook ]; patchPhase = '' substituteInPlace qmltermwidget.pro \ --replace '$$[QT_INSTALL_QML]' "/lib/qt5/qml/" ''; - configurePhase = '' - runHook preConfigure - qmake PREFIX=$out - runHook postConfigure - ''; - - installPhase=''make INSTALL_ROOT="$out" install''; + installFlags = [ "INSTALL_ROOT=$(out)" ]; enableParallelBuilding = true; |