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

radiotray-ng: use checkInputs, but disable tests, also cleanup

Browse Source
This commit is contained in:
Jan Malakhovski 2018-08-08 18:15:17 +00:00
parent 1662443fa1
commit 1cb596748f
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@
# rt2rtng # rt2rtng
, python2 , python2
# Testing # Testing
, gmock , gtest
# Fixup # Fixup
, wrapGAppsHook , wrapGAppsHook
, makeWrapper , makeWrapper
@ -58,11 +58,10 @@ stdenv.mkDerivation rec {
libxdg_basedir libxdg_basedir
lsb-release lsb-release
wxGTK wxGTK
] ++ stdenv.lib.optional doCheck gmock ] ++ gstInputs
++ gstInputs
++ pythonInputs; ++ pythonInputs;
prePatch = '' postPatch = ''
for x in debian/CMakeLists.txt include/radiotray-ng/common.hpp data/*.desktop; do for x in debian/CMakeLists.txt include/radiotray-ng/common.hpp data/*.desktop; do
substituteInPlace $x --replace /usr $out substituteInPlace $x --replace /usr $out
done done
@ -74,14 +73,16 @@ stdenv.mkDerivation rec {
--replace radiotray-ng-notification radiotray-ng-on --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; enableParallelBuilding = true;
# XXX: as of 0.2.2, tries to download gmock instead of checking for provided checkInputs = [ gtest ];
doCheck = false;
checkPhase = "ctest"; checkPhase = "ctest";
# doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
doCheck = false; # fails to pick up supplied gtest, tries to download it instead
preFixup = '' preFixup = ''
gappsWrapperArgs+=(--suffix PATH : ${stdenv.lib.makeBinPath [ dbus ]}) gappsWrapperArgs+=(--suffix PATH : ${stdenv.lib.makeBinPath [ dbus ]})