diff options
author | Aristid Breitkreuz <aristidb@gmail.com> | 2014-10-05 14:53:44 +0200 |
---|---|---|
committer | Aristid Breitkreuz <aristidb@gmail.com> | 2014-10-05 14:53:44 +0200 |
commit | 596b4b42edbf8f5ee75a9a6a72dfef9239ad2325 (patch) | |
tree | 047b455e409e923b2027c847060623d0138d8a42 | |
parent | 37357d0c8e25f5e2ede1b2557b7d280a3650bc38 (diff) | |
parent | 213511c316ecb49de851ab7857886790db2527c1 (diff) | |
download | nixlib-596b4b42edbf8f5ee75a9a6a72dfef9239ad2325.tar nixlib-596b4b42edbf8f5ee75a9a6a72dfef9239ad2325.tar.gz nixlib-596b4b42edbf8f5ee75a9a6a72dfef9239ad2325.tar.bz2 nixlib-596b4b42edbf8f5ee75a9a6a72dfef9239ad2325.tar.lz nixlib-596b4b42edbf8f5ee75a9a6a72dfef9239ad2325.tar.xz nixlib-596b4b42edbf8f5ee75a9a6a72dfef9239ad2325.tar.zst nixlib-596b4b42edbf8f5ee75a9a6a72dfef9239ad2325.zip |
Merge pull request #4378 from abbradar/deadbeef-fix
fix "Open..." menu items in "deadbeef"
-rw-r--r-- | lib/maintainers.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/audio/deadbeef/default.nix | 22 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 17 insertions, 8 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 93dc208d73d7..7c75bfdc0c67 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -10,7 +10,7 @@ akc = "Anders Claesson <akc@akc.is>"; algorith = "Dries Van Daele <dries_van_daele@telenet.be>"; all = "Nix Committers <nix-commits@lists.science.uu.nl>"; - abbradar = "Nikolay Amiantov <nikoamia@gmail.com>"; + abbradar = "Nikolay Amiantov <ab@fmap.me>"; amiddelk = "Arie Middelkoop <amiddelk@gmail.com>"; amorsillo = "Andrew Morsillo <andrew.morsillo@gmail.com>"; AndersonTorres = "Anderson Torres <torres.anderson.85@gmail.com>"; diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index b09ef2bc711e..ca8ce453e63d 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk +{ stdenv, fetchurl, intltool, pkgconfig +# deadbeef can use either gtk2 or gtk3 +, gtk2Support ? true, gtk2 ? null +, gtk3Support ? false, gtk3 ? null, gsettings_desktop_schemas ? null, makeWrapper ? null # input plugins , vorbisSupport ? true, libvorbis ? null , mp123Support ? true, libmad ? null @@ -23,6 +26,9 @@ , remoteSupport ? true, curl ? null }: +assert gtk2Support || gtk3Support; +assert gtk2Support -> gtk2 != null; +assert gtk3Support -> gtk3 != null && gsettings_desktop_schemas != null && makeWrapper != null; assert vorbisSupport -> libvorbis != null; assert mp123Support -> libmad != null; assert flacSupport -> flac != null; @@ -41,9 +47,6 @@ assert overloadSupport -> zlib != null; assert wavpackSupport -> wavpack != null; assert remoteSupport -> curl != null; -# DeaDBeeF installs working .desktop file(s) all by itself, so we don't need to -# handle that. - stdenv.mkDerivation rec { name = "deadbeef-0.6.2"; @@ -53,7 +56,8 @@ stdenv.mkDerivation rec { }; buildInputs = with stdenv.lib; - [ gtk ] + optional gtk2Support gtk2 + ++ optionals gtk3Support [gtk3 gsettings_desktop_schemas] ++ optional vorbisSupport libvorbis ++ optional mp123Support libmad ++ optional flacSupport flac @@ -73,10 +77,16 @@ stdenv.mkDerivation rec { ++ optional remoteSupport curl ; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = with stdenv.lib; [ intltool pkgconfig ] + ++ optional gtk3Support makeWrapper; enableParallelBuilding = true; + postInstall = if !gtk3Support then "" else '' + wrapProgram "$out/bin/deadbeef" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + ''; + meta = with stdenv.lib; { description = "Ultimate Music Player for GNU/Linux"; homepage = http://deadbeef.sourceforge.net/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 025ce6ed8e32..f4286623be8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8813,7 +8813,6 @@ let dd-agent = callPackage ../tools/networking/dd-agent { inherit (pythonPackages) tornado; }; deadbeef = callPackage ../applications/audio/deadbeef { - gtk = gtk3; pulseSupport = config.pulseaudio or true; }; |