diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-03-03 14:10:48 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-03-04 14:58:58 +0300 |
| commit | 630ab80bd469737f44fb72aca40ae65094b847ea (patch) | |
| tree | 26d6853da758f29c1b7053f491cbda98acc2b2ea /pkgs/applications/audio/deadbeef | |
| parent | 26bf9b28d87ea505e7bfd27d79d0b1d482b8342b (diff) | |
| download | nixlib-630ab80bd469737f44fb72aca40ae65094b847ea.tar nixlib-630ab80bd469737f44fb72aca40ae65094b847ea.tar.gz nixlib-630ab80bd469737f44fb72aca40ae65094b847ea.tar.bz2 nixlib-630ab80bd469737f44fb72aca40ae65094b847ea.tar.lz nixlib-630ab80bd469737f44fb72aca40ae65094b847ea.tar.xz nixlib-630ab80bd469737f44fb72aca40ae65094b847ea.tar.zst nixlib-630ab80bd469737f44fb72aca40ae65094b847ea.zip | |
deadbeef: 1.6.2 -> 1.7.0
Diffstat (limited to 'pkgs/applications/audio/deadbeef')
| -rw-r--r-- | pkgs/applications/audio/deadbeef/default.nix | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index 1a2b4b7cc879..b89420339768 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, intltool, pkgconfig, fetchpatch +{ stdenv, fetchurl, intltool, pkgconfig, fetchpatch, jansson # deadbeef can use either gtk2 or gtk3 -, gtk2Support ? true, gtk2 ? null -, gtk3Support ? false, gtk3 ? null, gsettings_desktop_schemas ? null, makeWrapper ? null +, gtk2Support ? false, gtk2 ? null +, gtk3Support ? true, gtk3 ? null, gsettings_desktop_schemas ? null, makeWrapper ? null # input plugins , vorbisSupport ? true, libvorbis ? null , mp123Support ? true, libmad ? null @@ -52,21 +52,22 @@ assert wavpackSupport -> wavpack != null; assert remoteSupport -> curl != null; stdenv.mkDerivation rec { - name = "deadbeef-0.6.2"; + name = "deadbeef-${version}"; + version = "0.7.0"; src = fetchurl { url = "mirror://sourceforge/project/deadbeef/${name}.tar.bz2"; - sha256 = "06jfsqyakpvq0xhah7dlyvdzh5ym3hhb4yfczczw11ijd1kbjcrl"; + sha256 = "0s6qip1zs83pig75pnd30ayiv1dbbj7s72px9mr31f4m0v86kaqx"; }; - buildInputs = with stdenv.lib; - optional gtk2Support gtk2 - ++ optionals gtk3Support [gtk3 gsettings_desktop_schemas] + buildInputs = with stdenv.lib; [ jansson ] + ++ optional gtk2Support gtk2 + ++ optionals gtk3Support [ gtk3 gsettings_desktop_schemas ] ++ optional vorbisSupport libvorbis ++ optional mp123Support libmad ++ optional flacSupport flac ++ optional wavSupport libsndfile - ++ optionals cdaSupport [libcdio libcddb] + ++ optionals cdaSupport [ libcdio libcddb ] ++ optional aacSupport faad2 ++ optional zipSupport libzip ++ optional ffmpegSupport ffmpeg @@ -88,12 +89,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = [ (fetchpatch { - url = "https://github.com/Alexey-Yakovenko/deadbeef/commit/e7725ea73fa1bd279a3651704870156bca8efea8.patch"; - sha256 = "1530w968zyvcm9c8k57889n125k7a1kk3ydinjm398n07gypd599"; - }) - ]; - postInstall = if !gtk3Support then "" else '' wrapProgram "$out/bin/deadbeef" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" |