cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

nicotine-plus: 1.4.1 -> 3.0.6

Browse source
This commit is contained in:
Emery Hemingway 2021-05-08 10:28:06 +02:00 committed by ehmry
parent 9622485d70
commit b593afbfb6
2 changed files with 17 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
pkgs/applications/networking/soulseek/nicotine-plus/default.nix
View file

@ -1,44 +1,37 @@
{ lib, fetchFromGitHub, python27Packages, geoip }: { lib, fetchFromGitHub, python3Packages, gettext, gdk-pixbuf
, gobject-introspection, gtk3, wrapGAppsHook }:
with lib; with lib;
python27Packages.buildPythonApplication { python3Packages.buildPythonApplication rec {
pname = "nicotine-plus"; pname = "nicotine-plus";
version = "1.4.1"; version = "3.0.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Nicotine-Plus"; owner = "Nicotine-Plus";
repo = "nicotine-plus"; repo = "nicotine-plus";
rev = "4e057d64184885c63488d4213ade3233bd33e67b"; rev = version;
sha256 = "11j2qm67sszfqq730czsr2zmpgkghsb50556ax1vlpm7rw3gm33c"; sha256 = "sha256-NL6TXFRB7OeqNEfdANkEqh+MCOF1+ehR+6RO1XsIix8=";
}; };
propagatedBuildInputs = with python27Packages; [ nativeBuildInputs = [ gettext wrapGAppsHook ];
pygtk
miniupnpc
mutagen
notify
(GeoIP.override { inherit geoip; })
];
# Insert real docs directory. propagatedBuildInputs = [ gtk3 gdk-pixbuf gobject-introspection ]
# os.getcwd() is not needed ++ (with python3Packages; [ pygobject3 ]);
postPatch = ''
substituteInPlace ./pynicotine/gtkgui/frame.py \
--replace "paths.append(os.getcwd())" "paths.append('"$out"/doc')"
'';
postFixup = '' postInstall = ''
mkdir -p $out/doc/
mv ./doc/NicotinePlusGuide $out/doc/
mv $out/bin/nicotine $out/bin/nicotine-plus mv $out/bin/nicotine $out/bin/nicotine-plus
substituteInPlace $out/share/applications/org.nicotine_plus.Nicotine.desktop \
--replace "Exec=nicotine" "Exec=$out/bin/nicotine-plus"
''; '';
doCheck = false;
meta = { meta = {
description = "A graphical client for the SoulSeek peer-to-peer system"; description = "A graphical client for the SoulSeek peer-to-peer system";
homepage = "https://www.nicotine-plus.org"; homepage = "https://www.nicotine-plus.org";
license = licenses.gpl3; license = licenses.gpl3Plus;
maintainers = with maintainers; [ klntsky ]; maintainers = with maintainers; [ ehmry klntsky ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

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

@ -24952,9 +24952,7 @@ in
newsflash = callPackage ../applications/networking/feedreaders/newsflash { }; newsflash = callPackage ../applications/networking/feedreaders/newsflash { };
nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus { nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus { };
geoip = geoipWithDatabase;
};
nice-dcv-client = callPackage ../applications/networking/remote/nice-dcv-client { }; nice-dcv-client = callPackage ../applications/networking/remote/nice-dcv-client { };