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 | |
| parent | 895100ef91690e2b68c12a0d201c923fee08b441 (diff) | |
| download | nixlib-d57e50d840589db867397cac29d1fd88092fbfd9.tar nixlib-d57e50d840589db867397cac29d1fd88092fbfd9.tar.gz nixlib-d57e50d840589db867397cac29d1fd88092fbfd9.tar.bz2 nixlib-d57e50d840589db867397cac29d1fd88092fbfd9.tar.lz nixlib-d57e50d840589db867397cac29d1fd88092fbfd9.tar.xz nixlib-d57e50d840589db867397cac29d1fd88092fbfd9.tar.zst nixlib-d57e50d840589db867397cac29d1fd88092fbfd9.zip | |
separate makeQtWrapper from qtbase setup-hook
Diffstat (limited to 'pkgs/applications/audio')
| -rw-r--r-- | pkgs/applications/audio/cantata/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/audio/dfasma/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/audio/sonic-visualiser/default.nix | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index fa0fe73ebae3..2d399ba44da3 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" ''; diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix index d439f344f5ba..9be3fff6ecbd 100644 --- a/pkgs/applications/audio/dfasma/default.nix +++ b/pkgs/applications/audio/dfasma/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia }: +{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, makeQtWrapper }: let @@ -41,6 +41,8 @@ in stdenv.mkDerivation { buildInputs = [ fftw libsndfile qtbase qtmultimedia ]; + nativeBuildInputs = [ makeQtWrapper ]; + postPatch = '' substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}' cp -Rv "${reaperFork.src}"/* external/REAPER diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index bef2006d60b2..ae7a39240a54 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate -, libsndfile, pkgconfig, libpulseaudio, qtbase, redland +, libsndfile, pkgconfig, libpulseaudio, makeQtWrapper, qtbase, redland , rubberband, serd, sord, vampSDK, fftwFloat }: @@ -32,6 +32,8 @@ stdenv.mkDerivation rec { libX11 ]; + nativeBuildInputs = [ makeQtWrapper ]; + buildPhase = '' for i in sonic-visualiser svapp svcore svgui; do cd $i && qmake -makefile PREFIX=$out && cd ..; |