ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

deadbeef: fix gtk3, use gtk2 by default, allow simultaneous

Browse Source
This commit is contained in:
Nikolay Amiantov 2014-10-02 23:55:50 +04:00
parent aafca4dd51
commit 1cc3fc871e
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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
, 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/;

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

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