From 2d826681e83392a91c8c05fe6bef36fa5518c8e9 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 16 Jan 2020 17:23:57 -0600
Subject: [PATCH] bibata-extra-cursors: unstable-2018-10-28 -> 0.3, sync
w/bibata-cursors
---
pkgs/data/icons/bibata-cursors/extra.nix | 26 ++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/pkgs/data/icons/bibata-cursors/extra.nix b/pkgs/data/icons/bibata-cursors/extra.nix
index dc0ead649744..b9d4c22f878f 100644
--- a/pkgs/data/icons/bibata-cursors/extra.nix
+++ b/pkgs/data/icons/bibata-cursors/extra.nix
@@ -1,25 +1,33 @@
-{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen }:
+{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }:
-stdenvNoCC.mkDerivation rec {
+let
+ py = python3.withPackages(ps: [ ps.pillow ]);
+in stdenvNoCC.mkDerivation rec {
pname = "bibata-extra-cursors";
- version = "unstable-2018-10-28";
-
+ version = "0.3";
+
src = fetchFromGitHub {
owner = "KaizIqbal";
repo = "Bibata_Extra_Cursor";
- rev = "66fb64b8dbe830e3f7ba2c2bdc4dacae7c438789";
- sha256 = "1xb7v06sbxbwzd7cnghv9c55lpbbkcaf1nswdrqy87gd0bnpdd2n";
+ rev = "v${version}";
+ sha256 = "1bh945hvakbh985jkr6g6x0myw3k49pvn24m1clvqdv35v65nfxk";
};
postPatch = ''
patchShebangs .
- substituteInPlace build.sh --replace "gksu " ""
+ substituteInPlace build.sh --replace "sudo" ""
+
+ # Don't generate windows cursors,
+ # they aren't used and aren't installed
+ # by the project's install script anyway.
+ echo "exit 0" > w32-make.sh
'';
nativeBuildInputs = [
gnome-themes-extra
inkscape
xcursorgen
+ py
];
buildPhase = ''
@@ -28,7 +36,9 @@ stdenvNoCC.mkDerivation rec {
installPhase = ''
install -dm 0755 $out/share/icons
- cp -pr Bibata_* $out/share/icons/
+ for x in Bibata_*; do
+ cp -pr $x/out/X11/$x $out/share/icons/
+ done
'';
meta = with stdenvNoCC.lib; {