1
0
Fork 0

Fix tasktree build

This commit is contained in:
Malte Brandy 2018-07-19 19:41:07 +02:00
parent d13e4d11fc
commit a73e27bffa
No known key found for this signature in database
GPG key ID: 226A2D41EF5378C9
2 changed files with 548 additions and 351 deletions

File diff suppressed because it is too large Load diff

View file

@ -1,4 +1,4 @@
{ pkgs, defaultCrateOverrides, makeDesktopItem, atk , pango, gnome3, cairo, gdk_pixbuf, glib, ... }:
{ pkgs, fetchFromGitHub, defaultCrateOverrides, makeDesktopItem, atk , pango, gnome3, cairo, gdk_pixbuf, glib, ... }:
((pkgs.callPackage ./Cargo.nix {}).tasktree_0_1_0 {}).override {
crateOverrides = defaultCrateOverrides // {
atk-sys = attr: { buildInputs = [ atk ]; };
@ -11,7 +11,7 @@
tasktree = attrs:
let
desktopItem = makeDesktopItem {
name = "Tasktree";
name = "tasktree";
exec = "tasktree";
icon = "tasktree";
comment = "A taskwarrior UI";
@ -19,30 +19,23 @@
genericName = "Tasktree";
categories = "Office;";
};
version = "abb312f";
in {
src = fetchFromGitHub {
rev = version;
owner = "maralorn";
repo = "tasktree";
sha256 = "139xjvi7b62k3075b4md9hdkb1xafhhiyz2yhbb96d73j1gkqs77";
};
depsSha256 = "14acvigygrrqyvxra2n01vpadc3mcf8981jrggpvwfbz58jrsa7h";
cargoSha256 = "14acvigygrrqyvxra2n01vpadc3mcf8981jrggpvwfbz58jrsa7h";
postInstall = ''
mkdir -p $out/share/applications
ln -s ${desktopItem}/share/applications/* $out/share/applications/
rm $out/lib/link
'';
'';
buildInputs = [ cairo atk gnome3.gtk gdk_pixbuf pango ];
};
};
}
#propagatedBuildInputs = [ gnome3.gtk atk cairo gdk_pixbuf glib pango ];
#postInstall = ''
#function installIcon () {
#mkdir -p $out/share/icons/hicolor/$1/apps/
#cp icons/$1.png $out/share/icons/hicolor/$1/apps/tasktree.png
#}
#installIcon "16x16"
#installIcon "32x32"
#installIcon "64x64"
#mkdir -p $out/share/applications
#ln -s ${desktopItem}/share/applications/* $out/share/applications/
#'';
#doCheck = false;
#}