diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/data/icons/bibata-cursors/default.nix | 32 | ||||
-rw-r--r-- | pkgs/development/python-modules/clickgen/default.nix | 17 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 15 insertions, 36 deletions
diff --git a/pkgs/data/icons/bibata-cursors/default.nix b/pkgs/data/icons/bibata-cursors/default.nix index b27b96cb5efb5..06c8becd64e51 100644 --- a/pkgs/data/icons/bibata-cursors/default.nix +++ b/pkgs/data/icons/bibata-cursors/default.nix @@ -3,47 +3,37 @@ , 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"; + sha256 = "zCk7qgPeae0BfzhxxU2Dk1SOWJQOxiWyJuzH/ri+Gq4="; }; - bitmaps = fetchurl { - url = "https://github.com/ful1e5/Bibata_Cursor/releases/download/v${version}/bitmaps.zip"; - sha256 = "1pcn6par0f0syyhzpzmqr3c6b9ri4lprkdd2ncwzdas01p2d9v1i"; - }; - - 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; { description = "Material Based Cursor Theme"; homepage = "https://github.com/ful1e5/Bibata_Cursor"; diff --git a/pkgs/development/python-modules/clickgen/default.nix b/pkgs/development/python-modules/clickgen/default.nix index 5b8d7728c84f9..f4983aea02517 100644 --- a/pkgs/development/python-modules/clickgen/default.nix +++ b/pkgs/development/python-modules/clickgen/default.nix @@ -4,9 +4,8 @@ , pythonOlder , fetchFromGitHub , pillow -, libX11 -, libXcursor -, libpng +, toml +, numpy , python , pytestCheckHook }: @@ -25,21 +24,11 @@ buildPythonPackage rec { 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 ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e8a545d898a7..c0a0212620b4f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26682,7 +26682,7 @@ with pkgs; 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 { }; |