Merge pull request #211379 from xanderio/fix-clickgen

bibata-cursors: 1.1.2 -> 2.0.3; clickgen: fix build after update to 2.1.3

Nick Cao bfc50c1f 3d2dcd7c

Changed files
+15 -36
pkgs
data
icons
bibata-cursors
development
python-modules
clickgen
top-level
+11 -21
pkgs/data/icons/bibata-cursors/default.nix
···
, fetchFromGitHub
, fetchurl
, clickgen
-
, unzip
+
, attrs
}:
stdenvNoCC.mkDerivation rec {
pname = "bibata-cursors";
-
version = "1.1.2";
+
version = "2.0.3";
src = fetchFromGitHub {
owner = "ful1e5";
repo = "Bibata_Cursor";
rev = "v${version}";
-
sha256 = "1q2wdbrmdnr9mwiilm5cc9im3zwbl7yaj1zpy5wwn44ypq3hcngy";
-
};
-
-
bitmaps = fetchurl {
-
url = "https://github.com/ful1e5/Bibata_Cursor/releases/download/v${version}/bitmaps.zip";
-
sha256 = "1pcn6par0f0syyhzpzmqr3c6b9ri4lprkdd2ncwzdas01p2d9v1i";
+
sha256 = "zCk7qgPeae0BfzhxxU2Dk1SOWJQOxiWyJuzH/ri+Gq4=";
};
-
nativeBuildInputs = [ unzip ];
-
-
buildInputs = [ clickgen ];
+
buildInputs = [ clickgen attrs ];
buildPhase = ''
-
mkdir bitmaps
-
unzip $bitmaps -d bitmaps
-
rm -rf themes
-
cd builder && make build_unix
+
ctgen build.toml -p x11 -d 'bitmaps/Bibata-Modern-Amber' -n 'Bibata-Modern-Amber' -c 'Yellowish and rounded edge bibata cursors.'
+
ctgen build.toml -p x11 -d 'bitmaps/Bibata-Modern-Classic' -n 'Bibata-Modern-Classic' -c 'Black and rounded edge Bibata cursors.'
+
ctgen build.toml -p x11 -d 'bitmaps/Bibata-Modern-Ice' -n 'Bibata-Modern-Ice' -c 'White and rounded edge Bibata cursors.'
+
+
ctgen build.toml -p x11 -d 'bitmaps/Bibata-Original-Amber' -n 'Bibata-Original-Amber' -c 'Yellowish and sharp edge Bibata cursors.'
+
ctgen build.toml -p x11 -d 'bitmaps/Bibata-Original-Classic' -n 'Bibata-Original-Classic' -c 'Black and sharp edge Bibata cursors.'
+
ctgen build.toml -p x11 -d 'bitmaps/Bibata-Original-Ice' -n 'Bibata-Original-Ice' -c 'White and sharp edge Bibata cursors.'
'';
installPhase = ''
install -dm 0755 $out/share/icons
-
cd ../
cp -rf themes/* $out/share/icons/
-
'';
-
-
postPatch = ''
-
substituteInPlace "builder/Makefile" \
-
--replace "/bin/bash" "bash"
'';
meta = with lib; {
+3 -14
pkgs/development/python-modules/clickgen/default.nix
···
, pythonOlder
, fetchFromGitHub
, pillow
-
, libX11
-
, libXcursor
-
, libpng
+
, toml
+
, numpy
, python
, pytestCheckHook
}:
···
sha256 = "sha256-qDaSfIeKCbyl3C2iKz9DYQc1oNwTe5xDlGg/yYhakSw=";
};
-
buildInputs = [ libXcursor libX11 libpng ];
-
-
propagatedBuildInputs = [ pillow ];
+
propagatedBuildInputs = [ pillow toml numpy ];
checkInputs = [ pytestCheckHook ];
-
postBuild = ''
-
# Needs to build xcursorgen.so
-
cd src/xcursorgen
-
make
-
cd ../..
-
'';
-
postInstall = ''
-
install -m644 src/xcursorgen/xcursorgen.so $out/${python.sitePackages}/clickgen/xcursorgen.so
# Copying scripts directory needed by clickgen script at $out/bin/
cp -R src/clickgen/scripts $out/${python.sitePackages}/clickgen/scripts
'';
+1 -1
pkgs/top-level/all-packages.nix
···
bgnet = callPackage ../data/documentation/bgnet { };
-
bibata-cursors = callPackage ../data/icons/bibata-cursors { };
+
bibata-cursors = callPackage ../data/icons/bibata-cursors { attrs = python3Packages.attrs; };
bibata-extra-cursors = callPackage ../data/icons/bibata-cursors/extra.nix { };
bibata-cursors-translucent = callPackage ../data/icons/bibata-cursors/translucent.nix { };