JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #77852 from dtzWill/fix/bibata-cursors-and-update-extra-cursors-too

Browse Source 
bibata-{,extra-}cursors: fix, faster, smaller; bump extra variant from git -> 0.3
This commit is contained in:
Will Dietz 2020-01-26 16:41:56 -06:00 committed by GitHub
commit 05d201560b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/data/icons/bibata-cursors/default.nix
View File

@ -16,6 +16,11 @@ in stdenvNoCC.mkDerivation rec {
postPatch = ''
patchShebangs .
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 = [
@ -31,7 +36,9 @@ in 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; {

26
pkgs/data/icons/bibata-cursors/extra.nix
View File

@ -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; {