Merge commit '373488e6f4c3dc3bb51cabcb959e4a70eb5d7b2c'

2 files changed, 60 insertions, 4 deletions

diff --git a/nixpkgs/pkgs/applications/audio/radiotray-ng/default.nix b/nixpkgs/pkgs/applications/audio/radiotray-ng/default.nix
index 900c2bf7a41f..1838268a0ea9 100644
--- a/nixpkgs/pkgs/applications/audio/radiotray-ng/default.nix
+++ b/nixpkgs/pkgs/applications/audio/radiotray-ng/default.nix
@@ -40,13 +40,13 @@ let
 in
 stdenv.mkDerivation rec {
   name = "radiotray-ng-${version}";
-  version = "0.2.4";
+  version = "0.2.5";
 
   src = fetchFromGitHub {
     owner = "ebruck";
     repo = "radiotray-ng";
     rev = "v${version}";
-    sha256 = "1jk80fv8ivwdx7waivls0mczn0rx4wv0fy7a28k77m88i5gkfgyw";
+    sha256 = "1crvpn1mgrv7bd2k683mpgs59785mkrjvmp1f14iyq4qrr0f9zzi";
   };
 
   nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ];
@@ -61,6 +61,8 @@ stdenv.mkDerivation rec {
   ] ++ gstInputs
     ++ pythonInputs;
 
+  patches = [ ./no-dl-googletest.patch ];
+
   postPatch = ''
     for x in debian/CMakeLists.txt include/radiotray-ng/common.hpp data/*.desktop; do
       substituteInPlace $x --replace /usr $out
@@ -80,8 +82,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   checkInputs = [ gtest ];
-  # doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
-  doCheck = false; # fails to pick up supplied gtest, tries to download it instead
+  doCheck = !stdenv.isAarch64; # single failure that I can't explain
 
   preFixup = ''
     gappsWrapperArgs+=(--suffix PATH : ${stdenv.lib.makeBinPath [ dbus ]})
diff --git a/nixpkgs/pkgs/applications/audio/radiotray-ng/no-dl-googletest.patch b/nixpkgs/pkgs/applications/audio/radiotray-ng/no-dl-googletest.patch
new file mode 100644
index 000000000000..3578d2d72b03
--- /dev/null
+++ b/nixpkgs/pkgs/applications/audio/radiotray-ng/no-dl-googletest.patch
@@ -0,0 +1,55 @@
+From 2ce91cd2244e61d54e0c0a3b26851912240b0667 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
+
+---
+ CMakeLists.txt       | 18 ------------------
+ tests/CMakeLists.txt |  1 -
+ 2 files changed, 19 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fc1b9de..301c266 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -70,25 +70,7 @@ endif()
+ 
+ # build tests? Then we need googletest...
+ if (BUILD_TESTS)
+-    include(ExternalProject)
+-
+-    ExternalProject_Add(googletest
+-        PREFIX "${CMAKE_CURRENT_BINARY_DIR}/googletest"
+-        URL https://github.com/google/googletest/archive/release-1.8.1.tar.gz
+-        URL_HASH SHA256=9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c
+-        TIMEOUT 30
+-        DOWNLOAD_NO_PROGRESS true
+-        INSTALL_COMMAND "")
+-
+-    ExternalProject_Get_Property(googletest SOURCE_DIR)
+-    include_directories(${SOURCE_DIR}/googlemock/include ${SOURCE_DIR}/googletest/include)
+-    ExternalProject_Get_Property(googletest BINARY_DIR)
+-    link_directories(${BINARY_DIR}/googlemock ${BINARY_DIR}/googlemock/gtest)
+     set(GMOCK_BOTH_LIBRARIES gmock_main gmock gtest)
+-    set_property(DIRECTORY PROPERTY CLEAN_NO_CUSTOM "${CMAKE_CURRENT_BINARY_DIR}/googletest")
+-    unset(SOURCE_DIR)
+-    unset(BINARY_DIR)
+-
+     enable_testing()
+     add_subdirectory(tests)
+     add_subdirectory(tests/runners/)
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 859c048..58ab5c2 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -2,7 +2,6 @@ include(GoogleTest)
+ 
+ function(add_gmock_test target)
+     add_executable(${target} ${ARGN})
+-    add_dependencies(${target} googletest)
+     target_link_libraries(${target} config playlist bookmarks event_bus ${GMOCK_BOTH_LIBRARIES} ${XDG_BASEDIR_LIBRARIES} ${Boost_LIBRARIES} ${CURL_LIBRARIES} ${JSONCPP_LIBRARIES} pthread)
+     target_include_directories(${target} PRIVATE ${JSONCPP_INCLUDE_DIRS})
+     gtest_discover_tests(${target})
+-- 
+2.21.GIT
+