diff options
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/MMA/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/audio/baudline/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/audio/caudec/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/audio/clementine/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/audio/clerk/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/audio/deadbeef/wrapper.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/audio/faust/faust1.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/audio/faust/faust2.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/audio/google-play-music-desktop-player/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/audio/jamin/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/lash/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/linuxband/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/puredata/wrapper.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/audio/real_time_config_quick_scan/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/audio/rubyripper/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/audio/spotify/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/audio/vkeybd/default.nix | 3 |
17 files changed, 31 insertions, 27 deletions
diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix index ade595732c3b..25cb96965092 100644 --- a/pkgs/applications/audio/MMA/default.nix +++ b/pkgs/applications/audio/MMA/default.nix @@ -9,7 +9,8 @@ sha256 = "18k0hwlqky5x4y461fxmw77gvz7z8jyrvxicrqphsgvwwinzy732"; }; - buildInputs = [ makeWrapper python3 alsaUtils timidity ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ python3 alsaUtils timidity ]; patchPhase = '' sed -i 's@/usr/bin/aplaymidi@/${alsaUtils}/bin/aplaymidi@g' mma-splitrec diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix index 29c5130f575c..7d6d51011cc2 100644 --- a/pkgs/applications/audio/baudline/default.nix +++ b/pkgs/applications/audio/baudline/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { else throw "baudline isn't supported (yet?) on ${stdenv.hostPlatform.system}"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; # Prebuilt binary distribution. # "patchelf --set-rpath" seems to break the application (cannot start), using diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix index 0360922c8196..15ebb85136b0 100644 --- a/pkgs/applications/audio/caudec/default.nix +++ b/pkgs/applications/audio/caudec/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { patchShebangs ./install.sh ''; - buildInputs = [ bash makeWrapper ]; + nativeBuildInputs = [ bash makeWrapper ]; installPhase = '' ./install.sh --prefix=$out/bin diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index be0f2f72529c..e665edabd074 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -24,7 +24,7 @@ let ./clementine-spotify-blob.patch ]; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = [ boost @@ -68,7 +68,7 @@ let inherit src patches nativeBuildInputs postPatch; # gst_plugins needed for setup-hooks - buildInputs = buildInputs ++ [ makeWrapper ] ++ gst_plugins; + buildInputs = buildInputs ++ gst_plugins; preConfigure = '' rm -rf ext/{,lib}clementine-spotifyblob @@ -102,7 +102,7 @@ let # Use the same patches and sources as Clementine inherit src nativeBuildInputs patches postPatch; - buildInputs = buildInputs ++ [ libspotify makeWrapper ]; + buildInputs = buildInputs ++ [ libspotify ]; # Only build and install the Spotify blob preBuild = '' cd ext/clementine-spotifyblob diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/applications/audio/clerk/default.nix index 0724632a63e1..a2e71b955ec4 100644 --- a/pkgs/applications/audio/clerk/default.nix +++ b/pkgs/applications/audio/clerk/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { sha256 = "0y045my65hr3hjyx13jrnyg6g3wb41phqb1m7azc4l6vx6r4124b"; }; - buildInputs = [ makeWrapper pythonPackages.mpd2 ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ pythonPackages.mpd2 ]; dontBuild = true; diff --git a/pkgs/applications/audio/deadbeef/wrapper.nix b/pkgs/applications/audio/deadbeef/wrapper.nix index cd45ef5926b0..66108deab1e3 100644 --- a/pkgs/applications/audio/deadbeef/wrapper.nix +++ b/pkgs/applications/audio/deadbeef/wrapper.nix @@ -5,7 +5,7 @@ symlinkJoin { paths = [ deadbeef ] ++ plugins; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/deadbeef \ diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix index 6d7d2e2c2bae..81ce11b9ea19 100644 --- a/pkgs/applications/audio/faust/faust1.nix +++ b/pkgs/applications/audio/faust/faust1.nix @@ -30,7 +30,7 @@ let inherit src; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; passthru = { inherit wrap wrapWithBuildEnv; @@ -159,8 +159,7 @@ let stdenv.mkDerivation ((faust2ApplBase args) // { - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; @@ -195,7 +194,7 @@ let in stdenv.mkDerivation ((faust2ApplBase args) // { - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postFixup = '' for script in "$out"/bin/*; do diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 990d073528e1..051caf120fa2 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -168,8 +168,7 @@ let stdenv.mkDerivation ((faust2ApplBase args) // { - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; @@ -209,7 +208,7 @@ let in stdenv.mkDerivation ((faust2ApplBase args) // { - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postFixup = '' for script in "$out"/bin/*; do diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix index 0be1cc45717b..f86eed1d34da 100644 --- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { }; dontBuild = true; - buildInputs = [ dpkg makeWrapper ]; + nativeBuildInputs = [ dpkg makeWrapper ]; unpackPhase = '' dpkg -x $src . diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix index f111c4e99d7c..325d115b5816 100644 --- a/pkgs/applications/audio/jamin/default.nix +++ b/pkgs/applications/audio/jamin/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0g5v74cm0q3p3pzl6xmnp4rqayaymfli7c6z8s78h9rgd24fwbvn"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 makeWrapper ] + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 ] ++ (with perlPackages; [ perl XMLParser ]); NIX_LDFLAGS = "-ldl"; diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix index eb355a434096..74bbeb9b7bb7 100644 --- a/pkgs/applications/audio/lash/default.nix +++ b/pkgs/applications/audio/lash/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { # http://permalink.gmane.org/gmane.linux.redhat.fedora.extras.cvs/822346 patches = [ ./socket.patch ./gcc-47.patch ]; - buildInputs = [ alsaLib gtk2 libjack2 libxml2 makeWrapper - pkg-config readline ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [ alsaLib gtk2 libjack2 libxml2 readline ]; propagatedBuildInputs = [ libuuid ]; NIX_LDFLAGS = "-lm -lpthread -luuid"; diff --git a/pkgs/applications/audio/linuxband/default.nix b/pkgs/applications/audio/linuxband/default.nix index 118b54ad8587..ec034ae238de 100644 --- a/pkgs/applications/audio/linuxband/default.nix +++ b/pkgs/applications/audio/linuxband/default.nix @@ -11,8 +11,8 @@ in stdenv.mkDerivation rec { sha256 = "1r71h4yg775m4gax4irrvygmrsclgn503ykmc2qwjsxa42ri4n2n"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ makeWrapper MMA libjack2 libsmf python pyGtkGlade pygtksourceview ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [ MMA libjack2 libsmf python pyGtkGlade pygtksourceview ]; patchPhase = '' sed -i 's@/usr/@${MMA}/@g' src/main/config/linuxband.rc.in diff --git a/pkgs/applications/audio/puredata/wrapper.nix b/pkgs/applications/audio/puredata/wrapper.nix index 80968e2700b4..3444ef9acbdc 100644 --- a/pkgs/applications/audio/puredata/wrapper.nix +++ b/pkgs/applications/audio/puredata/wrapper.nix @@ -7,7 +7,7 @@ in symlinkJoin { paths = [ puredata ] ++ plugins; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/pd \ diff --git a/pkgs/applications/audio/real_time_config_quick_scan/default.nix b/pkgs/applications/audio/real_time_config_quick_scan/default.nix index 3fb476b65cc4..8bc2553f521b 100644 --- a/pkgs/applications/audio/real_time_config_quick_scan/default.nix +++ b/pkgs/applications/audio/real_time_config_quick_scan/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "16kanzp5i353x972zjkwgi3m8z90wc58613mlfzb0n01djdnm6k5"; }; - buildInputs = [ perlPackages.perl makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perlPackages.perl ]; dontBuild = true; diff --git a/pkgs/applications/audio/rubyripper/default.nix b/pkgs/applications/audio/rubyripper/default.nix index b7abfa40b863..e8a275db98d8 100644 --- a/pkgs/applications/audio/rubyripper/default.nix +++ b/pkgs/applications/audio/rubyripper/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { preConfigure = "patchShebangs ."; configureFlags = [ "--enable-cli" ]; - buildInputs = [ ruby cdparanoia makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ ruby cdparanoia ]; postInstall = '' wrapProgram "$out/bin/rrip_cli" \ --prefix PATH : "${ruby}/bin" \ diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 43ecb67d64a3..655a047a3a63 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -81,7 +81,8 @@ stdenv.mkDerivation { sha512 = "5b3d5d1f52a554c8e775b8aed16ef84e96bf3b61a2b53266e10d3c47e341899310af13cc8513b04424fc14532e36543a6fae677f80a036e3f51c75166d8d53d1"; }; - buildInputs = [ squashfsTools makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ squashfsTools ]; dontStrip = true; dontPatchELF = true; diff --git a/pkgs/applications/audio/vkeybd/default.nix b/pkgs/applications/audio/vkeybd/default.nix index 3409d8a49070..943bd0d8032b 100644 --- a/pkgs/applications/audio/vkeybd/default.nix +++ b/pkgs/applications/audio/vkeybd/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0107b5j1gf7dwp7qb4w2snj4bqiyps53d66qzl2rwj4jfpakws5a"; }; - buildInputs = [ alsaLib libX11 makeWrapper tcl tk ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ alsaLib libX11 tcl tk ]; configurePhase = '' mkdir -p $out/bin |