diff options
author | Jan Malakhovski <oxij@oxij.org> | 2018-08-08 18:15:17 +0000 |
---|---|---|
committer | Jan Malakhovski <oxij@oxij.org> | 2018-08-11 09:35:17 +0000 |
commit | 1cb596748f24427ab69c5e2568fe3b5ee6edf9c5 (patch) | |
tree | 32b624ae939fa6c27d26ef9e0a9bb719f0d7e445 /pkgs/applications/audio/radiotray-ng | |
parent | 1662443fa14ba8caef0ef2219f9f066aa8016987 (diff) |
radiotray-ng: use checkInputs, but disable tests, also cleanup
Diffstat (limited to 'pkgs/applications/audio/radiotray-ng')
-rw-r--r-- | pkgs/applications/audio/radiotray-ng/default.nix | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 9efd7bb386fb5..82bc42143c67e 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -23,7 +23,7 @@ # rt2rtng , python2 # Testing -, gmock +, gtest # Fixup , wrapGAppsHook , makeWrapper @@ -58,11 +58,10 @@ stdenv.mkDerivation rec { libxdg_basedir lsb-release wxGTK - ] ++ stdenv.lib.optional doCheck gmock - ++ gstInputs + ] ++ gstInputs ++ pythonInputs; - prePatch = '' + postPatch = '' for x in debian/CMakeLists.txt include/radiotray-ng/common.hpp data/*.desktop; do substituteInPlace $x --replace /usr $out done @@ -74,14 +73,16 @@ stdenv.mkDerivation rec { --replace radiotray-ng-notification radiotray-ng-on ''; - cmakeFlags = stdenv.lib.optional doCheck "-DBUILD_TESTS=ON"; + cmakeFlags = [ + "-DBUILD_TESTS=${if doCheck then "ON" else "OFF"}" + ]; enableParallelBuilding = true; - # XXX: as of 0.2.2, tries to download gmock instead of checking for provided - doCheck = false; - + checkInputs = [ gtest ]; checkPhase = "ctest"; + # doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = false; # fails to pick up supplied gtest, tries to download it instead preFixup = '' gappsWrapperArgs+=(--suffix PATH : ${stdenv.lib.makeBinPath [ dbus ]}) |