From d73d17b934c47499d8feb76e3689f439cbb3cd33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Fri, 26 Jan 2024 17:07:18 -0500 Subject: [PATCH 1/3] bibata-cursors: move to `pkgs/by-name` --- .../default.nix => by-name/bi/bibata-cursors/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) rename pkgs/{data/icons/bibata-cursors/default.nix => by-name/bi/bibata-cursors/package.nix} (95%) diff --git a/pkgs/data/icons/bibata-cursors/default.nix b/pkgs/by-name/bi/bibata-cursors/package.nix similarity index 95% rename from pkgs/data/icons/bibata-cursors/default.nix rename to pkgs/by-name/bi/bibata-cursors/package.nix index 06c8becd64e5..90ae06950b50 100644 --- a/pkgs/data/icons/bibata-cursors/default.nix +++ b/pkgs/by-name/bi/bibata-cursors/package.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , fetchurl , clickgen -, attrs +, python3Packages }: stdenvNoCC.mkDerivation rec { @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec { sha256 = "zCk7qgPeae0BfzhxxU2Dk1SOWJQOxiWyJuzH/ri+Gq4="; }; - buildInputs = [ clickgen attrs ]; + buildInputs = [ clickgen python3Packages.attrs ]; buildPhase = '' ctgen build.toml -p x11 -d 'bitmaps/Bibata-Modern-Amber' -n 'Bibata-Modern-Amber' -c 'Yellowish and rounded edge bibata cursors.' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0bab3ff8b0e2..0eb8fd25d627 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29061,7 +29061,6 @@ with pkgs; bgnet = callPackage ../data/documentation/bgnet { }; - 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 { }; From a742e5da2e8a00f47d1b81d8755e14d0c6831726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Fri, 26 Jan 2024 19:11:08 -0500 Subject: [PATCH 2/3] bibata-cursors: 2.0.3 -> 2.0.6 updates build process based on some upstream breaking changes, and preserves pre/post-hook phases --- pkgs/by-name/bi/bibata-cursors/package.nix | 36 +++++++++++++++------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/bi/bibata-cursors/package.nix b/pkgs/by-name/bi/bibata-cursors/package.nix index 90ae06950b50..4a0e8c1ef170 100644 --- a/pkgs/by-name/bi/bibata-cursors/package.nix +++ b/pkgs/by-name/bi/bibata-cursors/package.nix @@ -1,37 +1,51 @@ { lib , stdenvNoCC , fetchFromGitHub -, fetchurl +, fetchzip , clickgen -, python3Packages }: stdenvNoCC.mkDerivation rec { pname = "bibata-cursors"; - version = "2.0.3"; + version = "2.0.6"; src = fetchFromGitHub { owner = "ful1e5"; repo = "Bibata_Cursor"; rev = "v${version}"; - sha256 = "zCk7qgPeae0BfzhxxU2Dk1SOWJQOxiWyJuzH/ri+Gq4="; + hash = "sha256-iLBgQ0reg8HzUQMUcZboMYJxqpKXks5vJVZMHirK48k="; }; - buildInputs = [ clickgen python3Packages.attrs ]; + bitmaps = fetchzip { + url = "https://github.com/ful1e5/Bibata_Cursor/releases/download/v${version}/bitmaps.zip"; + hash = "sha256-8ujkyqby5sPcnscIPkay1gvd/1CH4R9yMJs1nH/mx8M="; + }; + + nativeBuildInputs = [ + clickgen + ]; buildPhase = '' - 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.' + runHook preBuild - 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.' + 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.' + + runHook postBuild ''; installPhase = '' + runHook preInstall + install -dm 0755 $out/share/icons cp -rf themes/* $out/share/icons/ + + runHook postInstall ''; meta = with lib; { From bc67fc6decea9f0811e0bc250b87144626dca2df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Fri, 26 Jan 2024 19:21:00 -0500 Subject: [PATCH 3/3] bibata-cursors: fix meta --- pkgs/by-name/bi/bibata-cursors/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/bi/bibata-cursors/package.nix b/pkgs/by-name/bi/bibata-cursors/package.nix index 4a0e8c1ef170..d3749c14a6c2 100644 --- a/pkgs/by-name/bi/bibata-cursors/package.nix +++ b/pkgs/by-name/bi/bibata-cursors/package.nix @@ -48,11 +48,11 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Material Based Cursor Theme"; homepage = "https://github.com/ful1e5/Bibata_Cursor"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ rawkode AdsonCicilioti ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ rawkode AdsonCicilioti ]; }; }