mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 04:49:01 +02:00
Merge pull request #149496 from AdsonCicilioti/bibata-cursors-update
Bibata cursors update
This commit is contained in:
commit
3aacdbb18c
|
@ -278,6 +278,12 @@
|
|||
githubId = 1250775;
|
||||
name = "Adolfo E. García Castro";
|
||||
};
|
||||
AdsonCicilioti = {
|
||||
name = "Adson Cicilioti";
|
||||
email = "adson.cicilioti@live.com";
|
||||
github = "AdsonCicilioti";
|
||||
githubId = 6278398;
|
||||
};
|
||||
adsr = {
|
||||
email = "as@php.net";
|
||||
github = "adsr";
|
||||
|
|
|
@ -1,51 +1,54 @@
|
|||
{ lib, stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, clickgen
|
||||
, unzip
|
||||
}:
|
||||
|
||||
let
|
||||
py = python3.withPackages(ps: [ ps.pillow ]);
|
||||
in stdenvNoCC.mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bibata-cursors";
|
||||
version = "0.4.2";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KaizIqbal";
|
||||
owner = "ful1e5";
|
||||
repo = "Bibata_Cursor";
|
||||
rev = "v${version}";
|
||||
sha256 = "1f7i5jkl21fvrr45zpcj40avkc7camjb1ddrrdlaabbplgz5mcgn";
|
||||
sha256 = "1q2wdbrmdnr9mwiilm5cc9im3zwbl7yaj1zpy5wwn44ypq3hcngy";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
substituteInPlace build.sh --replace "sudo" ""
|
||||
bitmaps = fetchurl {
|
||||
url = "https://github.com/ful1e5/Bibata_Cursor/releases/download/v${version}/bitmaps.zip";
|
||||
sha256 = "1pcn6par0f0syyhzpzmqr3c6b9ri4lprkdd2ncwzdas01p2d9v1i";
|
||||
};
|
||||
|
||||
# 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 = [ unzip ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gnome-themes-extra
|
||||
inkscape
|
||||
xcursorgen
|
||||
py
|
||||
];
|
||||
buildInputs = [ clickgen ];
|
||||
|
||||
buildPhase = ''
|
||||
HOME="$NIX_BUILD_ROOT" ./build.sh
|
||||
mkdir bitmaps
|
||||
unzip $bitmaps -d bitmaps
|
||||
rm -rf themes
|
||||
cd builder && make build_unix
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -dm 0755 $out/share/icons
|
||||
for x in Bibata_*; do
|
||||
cp -pr $x/out/X11/$x $out/share/icons/
|
||||
done
|
||||
cd ../
|
||||
cp -rf themes/* $out/share/icons/
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace "builder/Makefile" \
|
||||
--replace "/bin/bash" "bash"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Material Based Cursor";
|
||||
homepage = "https://github.com/KaizIqbal/Bibata_Cursor";
|
||||
description = "Material Based Cursor Theme";
|
||||
homepage = "https://github.com/ful1e5/Bibata_Cursor";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ rawkode ];
|
||||
maintainers = with maintainers; [ rawkode AdsonCicilioti ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,51 +1,54 @@
|
|||
{ lib, stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, clickgen
|
||||
, unzip
|
||||
}:
|
||||
|
||||
let
|
||||
py = python3.withPackages(ps: [ ps.pillow ]);
|
||||
in stdenvNoCC.mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bibata-extra-cursors";
|
||||
version = "0.3";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KaizIqbal";
|
||||
owner = "ful1e5";
|
||||
repo = "Bibata_Extra_Cursor";
|
||||
rev = "v${version}";
|
||||
sha256 = "1bh945hvakbh985jkr6g6x0myw3k49pvn24m1clvqdv35v65nfxk";
|
||||
sha256 = "0wndl4c547k99y0gq922hn7z1mwdgxvvyjfm6757g6shfbcmkz7m";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
substituteInPlace build.sh --replace "sudo" ""
|
||||
bitmaps = fetchurl {
|
||||
url = "https://github.com/ful1e5/Bibata_Extra_Cursor/releases/download/v${version}/bitmaps.zip";
|
||||
sha256 = "0vf14ln53wigaq3dkqdk5avarqplsq751nlv72da04ms6gqjfhdl";
|
||||
};
|
||||
|
||||
# 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 = [ unzip ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gnome-themes-extra
|
||||
inkscape
|
||||
xcursorgen
|
||||
py
|
||||
];
|
||||
buildInputs = [ clickgen ];
|
||||
|
||||
buildPhase = ''
|
||||
HOME="$NIX_BUILD_ROOT" ./build.sh
|
||||
mkdir bitmaps
|
||||
unzip $bitmaps -d bitmaps
|
||||
rm -rf themes
|
||||
cd builder && make build_unix
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -dm 0755 $out/share/icons
|
||||
for x in Bibata_*; do
|
||||
cp -pr $x/out/X11/$x $out/share/icons/
|
||||
done
|
||||
cd ../
|
||||
cp -rf themes/* $out/share/icons/
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace "builder/Makefile" \
|
||||
--replace "/bin/bash" "bash"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cursors Based on Bibata";
|
||||
homepage = "https://github.com/KaizIqbal/Bibata_Extra_Cursor";
|
||||
description = "Material Based Cursor Theme";
|
||||
homepage = "https://github.com/ful1e5/Bibata_Extra_Cursor";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ dtzWill ];
|
||||
maintainers = with maintainers; [ dtzWill AdsonCicilioti ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,31 +1,16 @@
|
|||
{ lib, stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen }:
|
||||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bibata-cursors-translucent";
|
||||
version = "unstable-2019-09-13";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Silicasandwhich";
|
||||
repo = "Bibata_Cursor_Translucent";
|
||||
rev = "2eed979d817148817ea6bca15c594809aa9c2cb9";
|
||||
sha256 = "1s688v40xx9jbvfncb4kgfnnxkmknji7igqx7c4q1ly9s7imbd1f";
|
||||
rev = "v${version}";
|
||||
sha256 = "1ddnwqkxricnd731blckcxvksbgql8k4pfiz65591p81n5095k8y";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
substituteInPlace build.sh --replace "gksu " ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
gnome-themes-extra
|
||||
inkscape
|
||||
xcursorgen
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
HOME="$NIX_BUILD_ROOT" ./build.sh
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -dm 0755 $out/share/icons
|
||||
cp -pr Bibata_* $out/share/icons/
|
||||
|
@ -36,6 +21,6 @@ stdenvNoCC.mkDerivation rec {
|
|||
homepage = "https://github.com/Silicasandwhich/Bibata_Cursor_Translucent";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ dtzWill ];
|
||||
maintainers = with maintainers; [ dtzWill AdsonCicilioti ];
|
||||
};
|
||||
}
|
||||
|
|
45
pkgs/development/python-modules/clickgen/default.nix
Normal file
45
pkgs/development/python-modules/clickgen/default.nix
Normal file
|
@ -0,0 +1,45 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pillow
|
||||
, libX11
|
||||
, libXcursor
|
||||
, libpng
|
||||
, python
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "clickgen";
|
||||
version = "1.1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ful1e5";
|
||||
repo = "clickgen";
|
||||
rev = "v${version}";
|
||||
sha256 = "108f3sbramd3hhs4d84s3i3lbwllfrkvjakjq4gdmbw6xpilvm0l";
|
||||
};
|
||||
|
||||
buildInputs = [ libXcursor libX11 libpng ];
|
||||
|
||||
propagatedBuildInputs = [ pillow ];
|
||||
|
||||
pythonImportsCheck = [ "clickgen" ];
|
||||
|
||||
postInstall = ''
|
||||
install -m644 clickgen/xcursorgen.so $out/${python.sitePackages}/clickgen/xcursorgen.so
|
||||
'';
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ful1e5/clickgen";
|
||||
description = "The hassle-free cursor building toolbox";
|
||||
longDescription = ''
|
||||
clickgen is API for building X11 and Windows Cursors from
|
||||
.png files. clickgen is using anicursorgen and xcursorgen under the hood.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ AdsonCicilioti ];
|
||||
};
|
||||
}
|
|
@ -2478,6 +2478,8 @@ with pkgs;
|
|||
|
||||
clickclack = callPackage ../tools/misc/clickclack { };
|
||||
|
||||
clickgen = with python3Packages; toPythonApplication clickgen;
|
||||
|
||||
clog-cli = callPackage ../development/tools/clog-cli { };
|
||||
|
||||
cloud-init = python3.pkgs.callPackage ../tools/virtualization/cloud-init { };
|
||||
|
|
|
@ -1597,6 +1597,8 @@ in {
|
|||
|
||||
click-threading = callPackage ../development/python-modules/click-threading { };
|
||||
|
||||
clickgen = callPackage ../development/python-modules/clickgen { };
|
||||
|
||||
clickhouse-cityhash = callPackage ../development/python-modules/clickhouse-cityhash { };
|
||||
|
||||
clickhouse-cli = callPackage ../development/python-modules/clickhouse-cli { };
|
||||
|
|
Loading…
Reference in a new issue