diff options
| author | Will Dietz <w@wdtz.org> | 2019-07-08 16:58:29 -0500 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-07-11 10:11:43 +0200 |
| commit | c763b8db0677b9f43dafd291ad22160f0d8881e0 (patch) | |
| tree | acb4ac39226009964eb91b4933e41be1ece99168 /pkgs/applications/audio/radiotray-ng | |
| parent | dbb5c800e2e971db6a44fea2fe2869faed5fd950 (diff) | |
| download | nixpkgs-c763b8db0677b9f43dafd291ad22160f0d8881e0.tar nixpkgs-c763b8db0677b9f43dafd291ad22160f0d8881e0.tar.gz nixpkgs-c763b8db0677b9f43dafd291ad22160f0d8881e0.tar.bz2 nixpkgs-c763b8db0677b9f43dafd291ad22160f0d8881e0.tar.lz nixpkgs-c763b8db0677b9f43dafd291ad22160f0d8881e0.tar.xz nixpkgs-c763b8db0677b9f43dafd291ad22160f0d8881e0.tar.zst nixpkgs-c763b8db0677b9f43dafd291ad22160f0d8881e0.zip | |
radiotray-ng: 0.2.5 -> 0.2.6
Diffstat (limited to 'pkgs/applications/audio/radiotray-ng')
| -rw-r--r-- | pkgs/applications/audio/radiotray-ng/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/applications/audio/radiotray-ng/no-dl-googletest.patch | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 91d82d686d0..c0186a146be 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 \ diff --git a/pkgs/applications/audio/radiotray-ng/no-dl-googletest.patch b/pkgs/applications/audio/radiotray-ng/no-dl-googletest.patch index 3578d2d72b0..3aee9751656 100644 --- a/pkgs/applications/audio/radiotray-ng/no-dl-googletest.patch +++ b/pkgs/applications/audio/radiotray-ng/no-dl-googletest.patch @@ -1,4 +1,4 @@ -From 2ce91cd2244e61d54e0c0a3b26851912240b0667 Mon Sep 17 00:00:00 2001 +From b6f7a9e2e0194c6baed63a33b7beff359080b8d9 Mon Sep 17 00:00:00 2001 From: Will Dietz <w@wdtz.org> Date: Sat, 16 Mar 2019 11:40:00 -0500 Subject: [PATCH] don't download googletest @@ -9,7 +9,7 @@ Subject: [PATCH] don't download googletest 2 files changed, 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index fc1b9de..301c266 100644 +index ddba1be..3396705 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,25 +70,7 @@ endif() @@ -51,5 +51,5 @@ index 859c048..58ab5c2 100644 target_include_directories(${target} PRIVATE ${JSONCPP_INCLUDE_DIRS}) gtest_discover_tests(${target}) -- -2.21.GIT +2.22.0 |