diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-05-07 15:29:28 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-05-07 15:29:28 +0300 |
| commit | f396fa8cb24dee446b00c9434401d1ad9c7eb4bb (patch) | |
| tree | 68d88d59001006ee1ddddb091defa34beb00c72d /pkgs/applications/audio/deadbeef | |
| parent | 62c41cc53932277809daa8915518e1e78c95316d (diff) | |
| download | nixpkgs-f396fa8cb24dee446b00c9434401d1ad9c7eb4bb.tar nixpkgs-f396fa8cb24dee446b00c9434401d1ad9c7eb4bb.tar.gz nixpkgs-f396fa8cb24dee446b00c9434401d1ad9c7eb4bb.tar.bz2 nixpkgs-f396fa8cb24dee446b00c9434401d1ad9c7eb4bb.tar.lz nixpkgs-f396fa8cb24dee446b00c9434401d1ad9c7eb4bb.tar.xz nixpkgs-f396fa8cb24dee446b00c9434401d1ad9c7eb4bb.tar.zst nixpkgs-f396fa8cb24dee446b00c9434401d1ad9c7eb4bb.zip | |
deadbeef: fix tray icon
Diffstat (limited to 'pkgs/applications/audio/deadbeef')
| -rw-r--r-- | pkgs/applications/audio/deadbeef/default.nix | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index 43aba89213f..07f9e565c2a 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, intltool, pkgconfig, fetchpatch, jansson # deadbeef can use either gtk2 or gtk3 , gtk2Support ? false, gtk2 ? null -, gtk3Support ? true, gtk3 ? null, gsettings_desktop_schemas ? null, makeWrapper ? null +, gtk3Support ? true, gtk3 ? null, gsettings_desktop_schemas ? null, wrapGAppsHook ? null # input plugins , vorbisSupport ? true, libvorbis ? null , mp123Support ? true, libmad ? null @@ -30,7 +30,7 @@ assert gtk2Support || gtk3Support; assert gtk2Support -> gtk2 != null; -assert gtk3Support -> gtk3 != null && gsettings_desktop_schemas != null && makeWrapper != null; +assert gtk3Support -> gtk3 != null && gsettings_desktop_schemas != null && wrapGAppsHook != null; assert vorbisSupport -> libvorbis != null; assert mp123Support -> libmad != null; assert flacSupport -> flac != null; @@ -85,15 +85,10 @@ stdenv.mkDerivation rec { ; nativeBuildInputs = with stdenv.lib; [ intltool pkgconfig ] - ++ optional gtk3Support makeWrapper; + ++ optional gtk3Support wrapGAppsHook; 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/"; |