git.iko.soy/typeable/nixpkgs
on master help sign in
radiotray-ng: 0.2.5 -> 0.2.6
commitc763b8db0677b9f43dafd291ad22160f0d8881e0 authorWill Dietz <w@wdtz.org> dateMon 8 Jul 2019, 16:58 (7 years ago) parentdbb5c80
2 files changed+8−7
pkgs/applications/audio/radiotray-ng/default.nix+5−4 pkgs/applications/audio/radiotray-ng/no-dl-googletest.patch+3−3
pkgs/applications/audio/radiotray-ng/default.nix+5−4
@@ -39,14 +39,14 @@ let
3939 pythonInputs = with python2.pkgs; [ python2 lxml ];
4040in
4141stdenv.mkDerivation rec {
42− name = "radiotray-ng-${version}";
43− version = "0.2.5";
42+ pname = "radiotray-ng";
43+ version = "0.2.6";
4444
4545 src = fetchFromGitHub {
4646 owner = "ebruck";
4747 repo = "radiotray-ng";
4848 rev = "v${version}";
49− sha256 = "1crvpn1mgrv7bd2k683mpgs59785mkrjvmp1f14iyq4qrr0f9zzi";
49+ sha256 = "0khrfxjas2ldh0kksq7l811srqy16ahjxchvz0hhykx5hykymxlb";
5050 };
5151
5252 nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ];
@@ -64,9 +64,10 @@ stdenv.mkDerivation rec {
6464 patches = [ ./no-dl-googletest.patch ];
6565
6666 postPatch = ''
67− for x in debian/CMakeLists.txt include/radiotray-ng/common.hpp data/*.desktop; do
67+ for x in package/CMakeLists.txt include/radiotray-ng/common.hpp data/*.desktop; do
6868 substituteInPlace $x --replace /usr $out
6969 done
70+ substituteInPlace package/CMakeLists.txt --replace /etc/xdg/autostart $out/etc/xdg/autostart
7071
7172 # We don't find the radiotray-ng-notification icon otherwise
7273 substituteInPlace data/radiotray-ng.desktop \
pkgs/applications/audio/radiotray-ng/no-dl-googletest.patch+3−3
@@ -1,4 +1,4 @@
1−From 2ce91cd2244e61d54e0c0a3b26851912240b0667 Mon Sep 17 00:00:00 2001
1+From b6f7a9e2e0194c6baed63a33b7beff359080b8d9 Mon Sep 17 00:00:00 2001
22From: Will Dietz <w@wdtz.org>
33Date: Sat, 16 Mar 2019 11:40:00 -0500
44Subject: [PATCH] don't download googletest
@@ -9,7 +9,7 @@ Subject: [PATCH] don't download googletest
99 2 files changed, 19 deletions(-)
1010
1111diff --git a/CMakeLists.txt b/CMakeLists.txt
12−index fc1b9de..301c266 100644
12+index ddba1be..3396705 100644
1313--- a/CMakeLists.txt
1414+++ b/CMakeLists.txt
1515@@ -70,25 +70,7 @@ endif()
@@ -51,5 +51,5 @@ index 859c048..58ab5c2 100644
5151 target_include_directories(${target} PRIVATE ${JSONCPP_INCLUDE_DIRS})
5252 gtest_discover_tests(${target})
5353--
54−2.21.GIT
54+2.22.0
5555