Merge pull request #35219 from dtzWill/update/radiotray-ng-0.2.1

radiotray-ng: 0.2.0 -> 0.2.1
This commit is contained in:
Will Dietz 2018-02-20 08:09:21 -06:00 committed by GitHub
commit 5dc76b3958
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -40,13 +40,13 @@ let
in
stdenv.mkDerivation rec {
name = "radiotray-ng-${version}";
version = "0.2.0";
version = "0.2.1";
src = fetchFromGitHub {
owner = "ebruck";
repo = "radiotray-ng";
rev = "v${version}";
sha256 = "12mhi0q137cjdpmpczvrcr7szq1ja1r8bm0gh03b925y8xyrqp5z";
sha256 = "0hqg6vn8hv5pic96klf1d9vj8fibrgiqnqb5vwrg3wvakx0y32kr";
};
nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ];
@ -63,10 +63,9 @@ stdenv.mkDerivation rec {
++ pythonInputs;
prePatch = ''
substituteInPlace debian/CMakeLists.txt \
--replace /usr $out
substituteInPlace include/radiotray-ng/common.hpp \
--replace /usr $out
for x in debian/CMakeLists.txt include/radiotray-ng/common.hpp data/*.desktop; do
substituteInPlace $x --replace /usr $out
done
# We don't find the radiotray-ng-notification icon otherwise
substituteInPlace data/radiotray-ng.desktop \
@ -75,6 +74,8 @@ stdenv.mkDerivation rec {
--replace radiotray-ng-notification radiotray-ng-on
'';
cmakeFlags = stdenv.lib.optional doCheck "-DBUILD_TESTS=ON";
enableParallelBuilding = true;
doCheck = true;