@@ -1,44 +1,37 @@
1−{ lib, fetchFromGitHub, python27Packages, geoip }:
1+{ lib, fetchFromGitHub, python3Packages, gettext, gdk-pixbuf
2+, gobject-introspection, gtk3, wrapGAppsHook }:
23
34with lib;
45
5−python27Packages.buildPythonApplication {
6+python3Packages.buildPythonApplication rec {
67 pname = "nicotine-plus";
7− version = "1.4.1";
8+ version = "3.0.6";
89
910 src = fetchFromGitHub {
1011 owner = "Nicotine-Plus";
1112 repo = "nicotine-plus";
12− rev = "4e057d64184885c63488d4213ade3233bd33e67b";
13− sha256 = "11j2qm67sszfqq730czsr2zmpgkghsb50556ax1vlpm7rw3gm33c";
13+ rev = version;
14+ sha256 = "sha256-NL6TXFRB7OeqNEfdANkEqh+MCOF1+ehR+6RO1XsIix8=";
1415 };
1516
16− propagatedBuildInputs = with python27Packages; [
17− pygtk
18− miniupnpc
19− mutagen
20− notify
21− (GeoIP.override { inherit geoip; })
22− ];
23−
24− # Insert real docs directory.
25− # os.getcwd() is not needed
26− postPatch = ''
27− substituteInPlace ./pynicotine/gtkgui/frame.py \
28− --replace "paths.append(os.getcwd())" "paths.append('"$out"/doc')"
29− '';
17+ nativeBuildInputs = [ gettext wrapGAppsHook ];
18+
19+ propagatedBuildInputs = [ gtk3 gdk-pixbuf gobject-introspection ]
20+ ++ (with python3Packages; [ pygobject3 ]);
3021
31− postFixup = ''
32− mkdir -p $out/doc/
33− mv ./doc/NicotinePlusGuide $out/doc/
22+ postInstall = ''
3423 mv $out/bin/nicotine $out/bin/nicotine-plus
24+ substituteInPlace $out/share/applications/org.nicotine_plus.Nicotine.desktop \
25+ --replace "Exec=nicotine" "Exec=$out/bin/nicotine-plus"
3526 '';
3627
28+ doCheck = false;
29+
3730 meta = {
3831 description = "A graphical client for the SoulSeek peer-to-peer system";
3932 homepage = "https://www.nicotine-plus.org";
40− license = licenses.gpl3;
41− maintainers = with maintainers; [ klntsky ];
33+ license = licenses.gpl3Plus;
34+ maintainers = with maintainers; [ ehmry klntsky ];
4235 platforms = platforms.unix;
4336 };
4437}