public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

radiotray-ng: 0.2.5 -> 0.2.6

Browse Source
This commit is contained in:
Will Dietz 2019-07-08 16:58:29 -05:00 committed by Frederik Rietdijk
parent dbb5c800e2
commit c763b8db06
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/audio/radiotray-ng/default.nix
View File

@ -39,14 +39,14 @@ let
pythonInputs = with python2.pkgs; [ python2 lxml ]; pythonInputs = with python2.pkgs; [ python2 lxml ];
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "radiotray-ng-${version}"; pname = "radiotray-ng";
version = "0.2.5"; version = "0.2.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ebruck"; owner = "ebruck";
repo = "radiotray-ng"; repo = "radiotray-ng";
rev = "v${version}"; rev = "v${version}";
sha256 = "1crvpn1mgrv7bd2k683mpgs59785mkrjvmp1f14iyq4qrr0f9zzi"; sha256 = "0khrfxjas2ldh0kksq7l811srqy16ahjxchvz0hhykx5hykymxlb";
}; };
nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ]; nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ];
@ -64,9 +64,10 @@ stdenv.mkDerivation rec {
patches = [ ./no-dl-googletest.patch ]; patches = [ ./no-dl-googletest.patch ];
postPatch = '' 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 substituteInPlace $x --replace /usr $out
done done
substituteInPlace package/CMakeLists.txt --replace /etc/xdg/autostart $out/etc/xdg/autostart
# We don't find the radiotray-ng-notification icon otherwise # We don't find the radiotray-ng-notification icon otherwise
substituteInPlace data/radiotray-ng.desktop \ substituteInPlace data/radiotray-ng.desktop \

6
pkgs/applications/audio/radiotray-ng/no-dl-googletest.patch
View File

@ -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> From: Will Dietz <w@wdtz.org>
Date: Sat, 16 Mar 2019 11:40:00 -0500 Date: Sat, 16 Mar 2019 11:40:00 -0500
Subject: [PATCH] don't download googletest Subject: [PATCH] don't download googletest
@ -9,7 +9,7 @@ Subject: [PATCH] don't download googletest
2 files changed, 19 deletions(-) 2 files changed, 19 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc1b9de..301c266 100644 index ddba1be..3396705 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -70,25 +70,7 @@ endif() @@ -70,25 +70,7 @@ endif()
@ -51,5 +51,5 @@ index 859c048..58ab5c2 100644
target_include_directories(${target} PRIVATE ${JSONCPP_INCLUDE_DIRS}) target_include_directories(${target} PRIVATE ${JSONCPP_INCLUDE_DIRS})
gtest_discover_tests(${target}) gtest_discover_tests(${target})
-- --
2.21.GIT 2.22.0