diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-05-17 14:26:11 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-06-18 08:44:42 -0500 |
commit | c816bbc8a86c7ea6c09ca42e1694fe08003a55fc (patch) | |
tree | 036a3c0d8a3a6a4be068cf153a863fc0114ef28f /pkgs/applications/audio | |
parent | 1607f51613fc63a6fbfc1884c55a9efea06161b3 (diff) | |
download | nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.gz nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.bz2 nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.lz nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.xz nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.zst nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.zip |
qt5: remove makeQtWrapper
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/audacious/qt-5.nix | 18 | ||||
-rw-r--r-- | pkgs/applications/audio/cantata/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/audio/dfasma/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/audio/sonic-visualiser/default.nix | 5 |
4 files changed, 10 insertions, 29 deletions
diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix index 663e0eb0cc8c..da143c7d946a 100644 --- a/pkgs/applications/audio/audacious/qt-5.nix +++ b/pkgs/applications/audio/audacious/qt-5.nix @@ -1,6 +1,6 @@ { - stdenv, lib, fetchurl, - gettext, makeQtWrapper, pkgconfig, + mkDerivation, lib, fetchurl, + gettext, pkgconfig, qtbase, alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b, libcddb, libcdio082, libcue, libjack2, libmad, libmcs, libmms, libmodplug, @@ -24,16 +24,14 @@ let }; in -stdenv.mkDerivation { +mkDerivation { inherit version; name = "audacious-qt5-${version}"; sourceFiles = lib.attrValues sources; sourceRoots = lib.attrNames sources; - nativeBuildInputs = [ - gettext makeQtWrapper pkgconfig - ]; + nativeBuildInputs = [ gettext pkgconfig ]; buildInputs = [ # Core dependencies @@ -68,15 +66,9 @@ stdenv.mkDerivation { fi done - - source $stdenv/setup - wrapQtProgram $out/bin/audacious - wrapQtProgram $out/bin/audtool ''; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "Audio player"; homepage = http://audacious-media-player.org/; maintainers = with maintainers; [ ttuegel ]; diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 3231e3e53017..82a6d44f6436 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, vlc , withQt4 ? false, qt4 -, withQt5 ? true, qtbase, qtsvg, qttools, makeQtWrapper +, withQt5 ? true, qtbase, qtsvg, qttools # Cantata doesn't build with cdparanoia enabled so we disable that # default for now until I (or someone else) figure it out. @@ -63,8 +63,6 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional withMusicbrainz libmusicbrainz5 ++ stdenv.lib.optional (withTaglib && withDevices) udisks2; - nativeBuildInputs = stdenv.lib.optional withQt5 makeQtWrapper; - cmakeFlags = stdenv.lib.flatten [ (fstat withQt5 "QT5") (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) @@ -88,10 +86,6 @@ stdenv.mkDerivation rec { sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/FindTaglib.cmake ''; - postInstall = stdenv.lib.optionalString withQt5 '' - wrapQtProgram "$out/bin/cantata" - ''; - meta = with stdenv.lib; { homepage = https://github.com/cdrummond/cantata; description = "A graphical client for MPD"; diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix index 53ca8d316a2e..918accb4e167 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, qmake, makeQtWrapper }: +{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake }: let @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { buildInputs = [ fftw libsndfile qtbase qtmultimedia ]; - nativeBuildInputs = [ makeQtWrapper qmake ]; + nativeBuildInputs = [ qmake ]; postPatch = '' substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}' @@ -53,10 +53,6 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - postInstall = '' - wrapQtProgram "$out/bin/dfasma" - ''; - meta = with stdenv.lib; { description = "Analyse and compare audio files in time and frequency"; longDescription = '' diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index d1e9b50dee31..bdb9911d3650 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, makeQtWrapper, qtbase, redland +, libsndfile, pkgconfig, libpulseaudio, qtbase, redland , qmake, rubberband, serd, sord, vampSDK, fftwFloat }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { libX11 ]; - nativeBuildInputs = [ makeQtWrapper pkgconfig qmake ]; + nativeBuildInputs = [ pkgconfig qmake ]; configurePhase = '' for i in sonic-visualiser svapp svcore svgui; @@ -43,7 +43,6 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,share/sonic-visualiser} cp sonic-visualiser $out/bin/ cp -r samples $out/share/sonic-visualiser/ - wrapQtProgram "$out/bin/sonic-visualiser" ''; meta = with stdenv.lib; { |