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

radiotray-ng: 0.1.7 -> 0.2.0

Browse Source 
Now with bookmark editor.
This commit is contained in:
Will Dietz 2018-01-06 15:12:56 -06:00
parent d3ad52a58e
commit 09fbc87cde
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchpatch { stdenv, fetchFromGitHub
, cmake, pkgconfig , cmake, pkgconfig
# Transport # Transport
, curl , curl
@ -15,6 +15,7 @@
, libappindicator-gtk3 , libappindicator-gtk3
, libnotify , libnotify
, libxdg_basedir , libxdg_basedir
, wxGTK
# GStreamer # GStreamer
, gst_all_1 , gst_all_1
# User-agent info # User-agent info
@ -39,13 +40,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "radiotray-ng-${version}"; name = "radiotray-ng-${version}";
version = "0.1.7"; version = "0.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ebruck"; owner = "ebruck";
repo = "radiotray-ng"; repo = "radiotray-ng";
rev = "v${version}"; rev = "v${version}";
sha256 = "1m853gzh9r249crn0xyrq22x154r005j58b0kq3nsrgi5cps2zdv"; sha256 = "12mhi0q137cjdpmpczvrcr7szq1ja1r8bm0gh03b925y8xyrqp5z";
}; };
nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ]; nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ];
@ -56,6 +57,7 @@ stdenv.mkDerivation rec {
glibmm hicolor_icon_theme gnome3.gsettings_desktop_schemas libappindicator-gtk3 libnotify glibmm hicolor_icon_theme gnome3.gsettings_desktop_schemas libappindicator-gtk3 libnotify
libxdg_basedir libxdg_basedir
lsb-release lsb-release
wxGTK
] ++ stdenv.lib.optional doCheck gmock ] ++ stdenv.lib.optional doCheck gmock
++ gstInputs ++ gstInputs
++ pythonInputs; ++ pythonInputs;
@ -65,15 +67,13 @@ stdenv.mkDerivation rec {
--replace /usr $out --replace /usr $out
substituteInPlace include/radiotray-ng/common.hpp \ substituteInPlace include/radiotray-ng/common.hpp \
--replace /usr $out --replace /usr $out
'';
patches = [ # We don't find the radiotray-ng-notification icon otherwise
(fetchpatch { substituteInPlace data/radiotray-ng.desktop \
# Fix menu separators and minor touchup to 'version' --replace radiotray-ng-notification radiotray-ng-on
url = "https://github.com/ebruck/radiotray-ng/commit/827e9f1baaa03ab4d8a5fb3aab043e72950eb965.patch"; substituteInPlace data/rtng-bookmark-editor.desktop \
sha256 = "1aykl6lq4pga34xg5r9mc616gxnd63q6gr8qzg57w6874cj3csrr"; --replace radiotray-ng-notification radiotray-ng-on
}) '';
];
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/top-level/all-packages.nix
View File

@ -16688,7 +16688,9 @@ with pkgs;
renoise = callPackage ../applications/audio/renoise {}; renoise = callPackage ../applications/audio/renoise {};
radiotray-ng = callPackage ../applications/audio/radiotray-ng { }; radiotray-ng = callPackage ../applications/audio/radiotray-ng {
wxGTK = wxGTK30;
};
rapcad = libsForQt56.callPackage ../applications/graphics/rapcad { boost = boost159; }; rapcad = libsForQt56.callPackage ../applications/graphics/rapcad { boost = boost159; };