diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2019-07-05 14:38:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-05 14:38:10 -0500 |
| commit | 56d5963382da1b4848615aa9139e527978c64670 (patch) | |
| tree | 6e76232d7b4fd5cf3034eef18f0e109f2b86bbb0 /pkgs/tools/graphics | |
| parent | 066491c2e18d6277e0765a3647068c93650fcd19 (diff) | |
| parent | 3adc9d04870605ca20969a98fe820535fc7a88a5 (diff) | |
| download | nixlib-56d5963382da1b4848615aa9139e527978c64670.tar nixlib-56d5963382da1b4848615aa9139e527978c64670.tar.gz nixlib-56d5963382da1b4848615aa9139e527978c64670.tar.bz2 nixlib-56d5963382da1b4848615aa9139e527978c64670.tar.lz nixlib-56d5963382da1b4848615aa9139e527978c64670.tar.xz nixlib-56d5963382da1b4848615aa9139e527978c64670.tar.zst nixlib-56d5963382da1b4848615aa9139e527978c64670.zip | |
Merge pull request #54525 from ttuegel/feature/qt-5/wrap-qt-apps
Wrap Qt applications
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/nifskope/default.nix | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix index c5651d0418e4..42da24e32399 100644 --- a/pkgs/tools/graphics/nifskope/default.nix +++ b/pkgs/tools/graphics/nifskope/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, substituteAll, libGLU, makeWrapper }: +{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, substituteAll, libGLU, wrapQtAppsHook }: stdenv.mkDerivation rec { name = "nifskope-${version}"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ qtbase qttools libGLU.dev makeWrapper ]; - nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase qttools libGLU.dev ]; + nativeBuildInputs = [ qmake wrapQtAppsHook ]; preConfigure = '' shopt -s globstar @@ -33,9 +33,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # Inspired by install/linux-install/nifskope.spec.in. - installPhase = let - qtVersion = "5.${stdenv.lib.versions.minor qtbase.version}"; - in '' + installPhase = '' runHook preInstall d=$out/share/nifskope @@ -53,8 +51,6 @@ stdenv.mkDerivation rec { find $out/share -type f -exec chmod -x {} \; - wrapProgram $out/bin/NifSkope --prefix QT_PLUGIN_PATH : "${qtbase}/lib/qt-${qtVersion}/plugins" - runHook postInstall ''; |