diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-16 22:59:20 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-20 18:55:41 +0300 |
| commit | 1237d0b8208c41b11b0fd60fa7cf90b903d764b9 (patch) | |
| tree | 150b953e069aa62248021c5a3e415266806ee9f4 /pkgs/applications/misc/cool-retro-term/default.nix | |
| parent | 6995d0193920685294f97f2b79e3c39b14e985ae (diff) | |
| download | nixpkgs-1237d0b8208c41b11b0fd60fa7cf90b903d764b9.tar nixpkgs-1237d0b8208c41b11b0fd60fa7cf90b903d764b9.tar.gz nixpkgs-1237d0b8208c41b11b0fd60fa7cf90b903d764b9.tar.bz2 nixpkgs-1237d0b8208c41b11b0fd60fa7cf90b903d764b9.tar.lz nixpkgs-1237d0b8208c41b11b0fd60fa7cf90b903d764b9.tar.xz nixpkgs-1237d0b8208c41b11b0fd60fa7cf90b903d764b9.tar.zst nixpkgs-1237d0b8208c41b11b0fd60fa7cf90b903d764b9.zip | |
cool-retro-term: move to qmakeHook
This reverts commit 44a2ca4a34ceb49b339ed8828d1ce6c5ecd493af.
Diffstat (limited to 'pkgs/applications/misc/cool-retro-term/default.nix')
| -rw-r--r-- | pkgs/applications/misc/cool-retro-term/default.nix | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix index 67b9b601139..9ffa36adc12 100644 --- a/pkgs/applications/misc/cool-retro-term/default.nix +++ b/pkgs/applications/misc/cool-retro-term/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, makeQtWrapper, qtbase, qtquick1, qmltermwidget, -qtquickcontrols, qtgraphicaleffects }: +qtquickcontrols, qtgraphicaleffects, qmakeHook }: stdenv.mkDerivation rec { version = "1.0.0"; @@ -17,15 +17,9 @@ stdenv.mkDerivation rec { ''; buildInputs = [ qtbase qtquick1 qmltermwidget qtquickcontrols qtgraphicaleffects ]; - nativeBuildInputs = [ makeQtWrapper ]; + nativeBuildInputs = [ makeQtWrapper qmakeHook ]; - configurePhase = '' - runHook preConfigure - qmake PREFIX=$out - runHook postConfigure - ''; - - installPhase = "make -j $NIX_BUILD_CORES INSTALL_ROOT=$out install"; + installFlags = [ "INSTALL_ROOT=$(out)" ]; preFixup = '' mv $out/usr/share $out/share |