diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2015-10-14 09:44:10 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-10-30 16:10:37 -0500 |
commit | d57e50d840589db867397cac29d1fd88092fbfd9 (patch) | |
tree | 7c4a6132db21ec13c769b740c7d0c3b35cab0022 /pkgs/applications/audio/cantata | |
parent | 895100ef91690e2b68c12a0d201c923fee08b441 (diff) |
separate makeQtWrapper from qtbase setup-hook
Diffstat (limited to 'pkgs/applications/audio/cantata')
-rw-r--r-- | pkgs/applications/audio/cantata/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index fa0fe73ebae36..2d399ba44da38 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake , withQt4 ? false, qt4 -, withQt5 ? true, qtbase, qtsvg, qttools +, withQt5 ? true, qtbase, qtsvg, qttools, makeQtWrapper # I'm unable to make KDE work here, crashes at runtime so I simply # make Qt4 the default until someone who wants KDE can figure it out. @@ -68,6 +68,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional withMusicbrainz libmusicbrainz5 ++ stdenv.lib.optional (withTaglib && !withKDE4 && withDevices) udisks2; + nativeBuildInputs = stdenv.lib.optional withQt5 makeQtWrapper; + unpackPhase = "tar -xvf $src"; sourceRoot = "${name}"; @@ -91,7 +93,7 @@ stdenv.mkDerivation rec { "-DENABLE_UDISKS2=ON" ]; - postInstall = '' + postInstall = stdenv.lib.optionalString withQt5 '' wrapQtProgram "$out/bin/cantata" ''; |