diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-21 08:37:30 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-21 08:37:30 +0200 |
| commit | 86c7662be0a2cef3d1d6f152e84ff436129dd2c1 (patch) | |
| tree | a195f510944c7d8f9a4efc683816491a05a269d9 /pkgs/applications/audio | |
| parent | 04ce4c3e42ec15c4420657052110d928dbdf5d84 (diff) | |
| parent | ca6ee8f519733e1f45b7598d995245dd687f535c (diff) | |
| download | nixlib-86c7662be0a2cef3d1d6f152e84ff436129dd2c1.tar nixlib-86c7662be0a2cef3d1d6f152e84ff436129dd2c1.tar.gz nixlib-86c7662be0a2cef3d1d6f152e84ff436129dd2c1.tar.bz2 nixlib-86c7662be0a2cef3d1d6f152e84ff436129dd2c1.tar.lz nixlib-86c7662be0a2cef3d1d6f152e84ff436129dd2c1.tar.xz nixlib-86c7662be0a2cef3d1d6f152e84ff436129dd2c1.tar.zst nixlib-86c7662be0a2cef3d1d6f152e84ff436129dd2c1.zip | |
Merge staging-next into master
Diffstat (limited to 'pkgs/applications/audio')
| -rw-r--r-- | pkgs/applications/audio/gtkpod/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/audio/jamin/default.nix | 10 |
2 files changed, 7 insertions, 9 deletions
diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index 6546fd7866ea..4bcddab54a08 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, wrapGAppsHook, intltool, libgpod, curl, flac, - gnome3, gtk3, gettext, perl, perlXMLParser, flex, libid3tag, + gnome3, gtk3, gettext, perlPackages, flex, libid3tag, libvorbis, gdk_pixbuf }: stdenv.mkDerivation rec { @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ]; buildInputs = [ - curl gettext perl perlXMLParser + curl gettext flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf gnome3.gdl gnome3.defaultIconTheme gnome3.anjuta - ]; + ] ++ (with perlPackages; [ perl XMLParser ]); patchPhase = '' sed -i 's/which/type -P/' scripts/*.sh diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix index 77946fc41ccc..eea9de5a1597 100644 --- a/pkgs/applications/audio/jamin/default.nix +++ b/pkgs/applications/audio/jamin/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fftwFloat, gtk2, ladspaPlugins, libjack2, liblo, libxml2 -, makeWrapper, pkgconfig, perl, perlXMLParser +, makeWrapper, pkgconfig, perlPackages }: stdenv.mkDerivation { @@ -11,11 +11,9 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 perl - perlXMLParser makeWrapper - ]; - + buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 makeWrapper ] + ++ (with perlPackages; [ perl XMLParser ]); + postInstall = '' wrapProgram $out/bin/jamin --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa ''; |