Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9aea511afe86
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3adeca3775ce
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 29, 2019

  1. cherrytree: fix build (#72261)

    @prusnak @veprbl
    prusnak authored and veprbl committed Oct 29, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    boesing Maximilian Bösing
    GPG key ID: 9A8988C93CEC81A3
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3adeca3 View commit details
Showing with 7 additions and 21 deletions.
  1. +7 −21 pkgs/applications/misc/cherrytree/default.nix
28 changes: 7 additions & 21 deletions pkgs/applications/misc/cherrytree/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];
};
}