diff options
author | Pavol Rusnak <pavol@rusnak.io> | 2019-10-29 22:38:42 +0100 |
---|---|---|
committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-10-29 17:38:42 -0400 |
commit | 3adeca3775ce8dd60d6b5f5943d7066381d83d96 (patch) | |
tree | a7316b1f40a6ab96f9d3cfd328177a0a16886fb6 /pkgs/applications | |
parent | 9aea511afe86e0fd3ddbab37befa7a87737f19d3 (diff) | |
download | nixlib-3adeca3775ce8dd60d6b5f5943d7066381d83d96.tar nixlib-3adeca3775ce8dd60d6b5f5943d7066381d83d96.tar.gz nixlib-3adeca3775ce8dd60d6b5f5943d7066381d83d96.tar.bz2 nixlib-3adeca3775ce8dd60d6b5f5943d7066381d83d96.tar.lz nixlib-3adeca3775ce8dd60d6b5f5943d7066381d83d96.tar.xz nixlib-3adeca3775ce8dd60d6b5f5943d7066381d83d96.tar.zst nixlib-3adeca3775ce8dd60d6b5f5943d7066381d83d96.zip |
cherrytree: fix build (#72261)
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/misc/cherrytree/default.nix | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 4e734aa849f6..d760cee6374d 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -1,8 +1,6 @@ -{ stdenv, fetchurl, pythonPackages, gettext }: - -with stdenv.lib; -stdenv.mkDerivation rec { +{ lib, fetchurl, pythonPackages, gettext }: +pythonPackages.buildPythonApplication rec { pname = "cherrytree"; version = "0.38.9"; @@ -11,26 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0xal09ijgxbzvp003s40xbrfnpq3ald1fw8nnpqq3yg7h6g6c5pw"; }; - buildInputs = with pythonPackages; - [ python gettext wrapPython pygtk dbus-python pygtksourceview ]; + nativeBuildInputs = [ gettext ]; - pythonPath = with pythonPackages; - [ pygtk dbus-python pygtksourceview ]; + propagatedBuildInputs = with pythonPackages; [ pygtk dbus-python pygtksourceview ]; patches = [ ./subprocess.patch ]; - installPhase = '' - python setup.py install --prefix="$out" - - for file in "$out"/bin/*; do - wrapProgram "$file" \ - --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH" - done - ''; - doCheck = false; - meta = { + meta = with lib; { description = "An hierarchical note taking application"; longDescription = '' Cherrytree is an hierarchical note taking application, @@ -42,9 +29,8 @@ stdenv.mkDerivation rec { around your hard drive can be conveniently placed into a Cherrytree document where you can easily find it. ''; - homepage = http://www.giuspen.com/cherrytree; + homepage = "http://www.giuspen.com/cherrytree"; license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres ]; }; } |