git.iko.soy/typeable/nixpkgs
on master help sign in
cherrytree: fix build (#72261)
commit3adeca3775ce8dd60d6b5f5943d7066381d83d96 authorPavol Rusnak <pavol@rusnak.io> dateTue 29 Oct 2019, 22:38 (7 years ago) parent9aea511
1 file changed+7−21
pkgs/applications/misc/cherrytree/default.nix+7−21
pkgs/applications/misc/cherrytree/default.nix+7−21
@@ -1,8 +1,6 @@
1−{ stdenv, fetchurl, pythonPackages, gettext }:
2−
3−with stdenv.lib;
4−stdenv.mkDerivation rec {
1+{ lib, fetchurl, pythonPackages, gettext }:
52
3+pythonPackages.buildPythonApplication rec {
64 pname = "cherrytree";
75 version = "0.38.9";
86
@@ -11,26 +9,15 @@ stdenv.mkDerivation rec {
119 sha256 = "0xal09ijgxbzvp003s40xbrfnpq3ald1fw8nnpqq3yg7h6g6c5pw";
1210 };
1311
14− buildInputs = with pythonPackages;
15− [ python gettext wrapPython pygtk dbus-python pygtksourceview ];
12+ nativeBuildInputs = [ gettext ];
1613
17− pythonPath = with pythonPackages;
18− [ pygtk dbus-python pygtksourceview ];
14+ propagatedBuildInputs = with pythonPackages; [ pygtk dbus-python pygtksourceview ];
1915
2016 patches = [ ./subprocess.patch ];
2117
22− installPhase = ''
23− python setup.py install --prefix="$out"
24−
25− for file in "$out"/bin/*; do
26− wrapProgram "$file" \
27− --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH"
28− done
29− '';
30−
3118 doCheck = false;
3219
33− meta = {
20+ meta = with lib; {
3421 description = "An hierarchical note taking application";
3522 longDescription = ''
3623 Cherrytree is an hierarchical note taking application,
@@ -42,9 +29,8 @@ stdenv.mkDerivation rec {
4229 around your hard drive can be conveniently placed into a
4330 Cherrytree document where you can easily find it.
4431 '';
45− homepage = http://www.giuspen.com/cherrytree;
32+ homepage = "http://www.giuspen.com/cherrytree";
4633 license = licenses.gpl3;
47− platforms = platforms.linux;
48− maintainers = [ maintainers.AndersonTorres ];
34+ maintainers = with maintainers; [ AndersonTorres ];
4935 };
5036}