diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-13 09:45:40 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-13 09:45:40 +0200 |
commit | 54065ae20d6c91cab54aa706d6e819baf673b80c (patch) | |
tree | 4b2efeafb2b34de1153ccfb5cf01387842c86143 /pkgs/applications/audio/radiotray-ng/default.nix | |
parent | 22cb7f25f2f939a5e38f5e0c0920a743c37a9480 (diff) | |
parent | 7803ff314c707ee11a6d8d1c9ac4cde70737d22e (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/audio/radiotray-ng/default.nix')
-rw-r--r-- | pkgs/applications/audio/radiotray-ng/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 91d82d686d03b..c0186a146beee 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -39,14 +39,14 @@ let pythonInputs = with python2.pkgs; [ python2 lxml ]; in stdenv.mkDerivation rec { - name = "radiotray-ng-${version}"; - version = "0.2.5"; + pname = "radiotray-ng"; + version = "0.2.6"; src = fetchFromGitHub { owner = "ebruck"; repo = "radiotray-ng"; rev = "v${version}"; - sha256 = "1crvpn1mgrv7bd2k683mpgs59785mkrjvmp1f14iyq4qrr0f9zzi"; + sha256 = "0khrfxjas2ldh0kksq7l811srqy16ahjxchvz0hhykx5hykymxlb"; }; nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ]; @@ -64,9 +64,10 @@ stdenv.mkDerivation rec { patches = [ ./no-dl-googletest.patch ]; postPatch = '' - for x in debian/CMakeLists.txt include/radiotray-ng/common.hpp data/*.desktop; do + for x in package/CMakeLists.txt include/radiotray-ng/common.hpp data/*.desktop; do substituteInPlace $x --replace /usr $out done + substituteInPlace package/CMakeLists.txt --replace /etc/xdg/autostart $out/etc/xdg/autostart # We don't find the radiotray-ng-notification icon otherwise substituteInPlace data/radiotray-ng.desktop \ |