public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4378 from abbradar/deadbeef-fix

Browse Source 
fix "Open..." menu items in "deadbeef"
This commit is contained in:
Aristid Breitkreuz 2014-10-05 14:53:44 +02:00
commit 596b4b42ed
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/maintainers.nix
View File

@ -10,7 +10,7 @@
akc = "Anders Claesson <akc@akc.is>"; akc = "Anders Claesson <akc@akc.is>";
algorith = "Dries Van Daele <dries_van_daele@telenet.be>"; algorith = "Dries Van Daele <dries_van_daele@telenet.be>";
all = "Nix Committers <nix-commits@lists.science.uu.nl>"; 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>"; amiddelk = "Arie Middelkoop <amiddelk@gmail.com>";
amorsillo = "Andrew Morsillo <andrew.morsillo@gmail.com>"; amorsillo = "Andrew Morsillo <andrew.morsillo@gmail.com>";
AndersonTorres = "Anderson Torres <torres.anderson.85@gmail.com>"; AndersonTorres = "Anderson Torres <torres.anderson.85@gmail.com>";

22
pkgs/applications/audio/deadbeef/default.nix
View File

@ -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 # input plugins
, vorbisSupport ? true, libvorbis ? null , vorbisSupport ? true, libvorbis ? null
, mp123Support ? true, libmad ? null , mp123Support ? true, libmad ? null
@ -23,6 +26,9 @@
, remoteSupport ? true, curl ? null , 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 vorbisSupport -> libvorbis != null;
assert mp123Support -> libmad != null; assert mp123Support -> libmad != null;
assert flacSupport -> flac != null; assert flacSupport -> flac != null;
@ -41,9 +47,6 @@ assert overloadSupport -> zlib != null;
assert wavpackSupport -> wavpack != null; assert wavpackSupport -> wavpack != null;
assert remoteSupport -> curl != 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 { stdenv.mkDerivation rec {
name = "deadbeef-0.6.2"; name = "deadbeef-0.6.2";
@ -53,7 +56,8 @@ stdenv.mkDerivation rec {
}; };
buildInputs = with stdenv.lib; buildInputs = with stdenv.lib;
[ gtk ] optional gtk2Support gtk2
++ optionals gtk3Support [gtk3 gsettings_desktop_schemas]
++ optional vorbisSupport libvorbis ++ optional vorbisSupport libvorbis
++ optional mp123Support libmad ++ optional mp123Support libmad
++ optional flacSupport flac ++ optional flacSupport flac
@ -73,10 +77,16 @@ stdenv.mkDerivation rec {
++ optional remoteSupport curl ++ optional remoteSupport curl
; ;
nativeBuildInputs = [ intltool pkgconfig ]; nativeBuildInputs = with stdenv.lib; [ intltool pkgconfig ]
++ optional gtk3Support makeWrapper;
enableParallelBuilding = true; enableParallelBuilding = true;
postInstall = if !gtk3Support then "" else ''
wrapProgram "$out/bin/deadbeef" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Ultimate Music Player for GNU/Linux"; description = "Ultimate Music Player for GNU/Linux";
homepage = http://deadbeef.sourceforge.net/; homepage = http://deadbeef.sourceforge.net/;

1
pkgs/top-level/all-packages.nix
View File

@ -8813,7 +8813,6 @@ let
dd-agent = callPackage ../tools/networking/dd-agent { inherit (pythonPackages) tornado; }; dd-agent = callPackage ../tools/networking/dd-agent { inherit (pythonPackages) tornado; };
deadbeef = callPackage ../applications/audio/deadbeef { deadbeef = callPackage ../applications/audio/deadbeef {
gtk = gtk3;
pulseSupport = config.pulseaudio or true; pulseSupport = config.pulseaudio or true;
}; };