diff options
Diffstat (limited to 'nixpkgs/pkgs/data/icons')
-rw-r--r-- | nixpkgs/pkgs/data/icons/bibata-cursors/default.nix | 22 | ||||
-rw-r--r-- | nixpkgs/pkgs/data/icons/bibata-cursors/extra.nix | 26 | ||||
-rw-r--r-- | nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix | 12 | ||||
-rw-r--r-- | nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix | 10 |
4 files changed, 45 insertions, 25 deletions
diff --git a/nixpkgs/pkgs/data/icons/bibata-cursors/default.nix b/nixpkgs/pkgs/data/icons/bibata-cursors/default.nix index a7a403726fa..d2e35136a8b 100644 --- a/nixpkgs/pkgs/data/icons/bibata-cursors/default.nix +++ b/nixpkgs/pkgs/data/icons/bibata-cursors/default.nix @@ -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-cursors"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "KaizIqbal"; repo = "Bibata_Cursor"; rev = "v${version}"; - sha256 = "14gvpjp4gv0m59qr8wls7xs5yjx5llldyzack5kg5cg2mzk2nsml"; + sha256 = "1f7i5jkl21fvrr45zpcj40avkc7camjb1ddrrdlaabbplgz5mcgn"; }; 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; { diff --git a/nixpkgs/pkgs/data/icons/bibata-cursors/extra.nix b/nixpkgs/pkgs/data/icons/bibata-cursors/extra.nix index dc0ead64974..b9d4c22f878 100644 --- a/nixpkgs/pkgs/data/icons/bibata-cursors/extra.nix +++ b/nixpkgs/pkgs/data/icons/bibata-cursors/extra.nix @@ -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; { diff --git a/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix b/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix index 64a982f6037..96514b6a4cd 100644 --- a/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix +++ b/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix @@ -2,20 +2,18 @@ stdenv.mkDerivation rec { pname = "iconpack-obsidian"; - version = "4.9"; + version = "4.10"; src = fetchFromGitHub { owner = "madmaxms"; repo = pname; rev = "v${version}"; - sha256 = "1w0lnr08gd0cnzv3n5094jqb7dpbpwwizfhvifdir0xsls1sf129"; + sha256 = "1imnbfrmizs0yx2165qj423y3m5vw9z33pqxmvhvs0rcwwddgqix"; }; nativeBuildInputs = [ gtk3 ]; - propagatedBuildInputs = [ - hicolor-icon-theme - ]; + propagatedBuildInputs = [ hicolor-icon-theme ]; dontDropIconThemeCache = true; @@ -31,8 +29,8 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Gnome Icon Pack based upon Faenza"; - homepage = https://github.com/madmaxms/iconpack-obsidian; + description = "Gnome icon pack based upon Faenza"; + homepage = "https://github.com/madmaxms/iconpack-obsidian"; license = licenses.lgpl3; # darwin cannot deal with file names differing only in case platforms = platforms.linux; diff --git a/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix index b7ae27aac68..8bfde381633 100644 --- a/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix @@ -2,17 +2,19 @@ stdenv.mkDerivation rec { pname = "qogir-icon-theme"; - version = "2019-09-15"; + version = "2020-01-29"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = "4e1b6c693615bc2c7c7a11df6f4b90f2e6fb67db"; - sha256 = "1vp1wp4fgmy5af8z8nb3m6wgmb6wbwlvx5smf9dxfcn254hdg8g0"; + rev = version; + sha256 = "0g6qiry4gzkr48xn4qi8sdna0hi3982sywskz9adkzqcznir542h"; }; nativeBuildInputs = [ gtk3 ]; + dontDropIconThemeCache = true; + installPhase = '' patchShebangs install.sh mkdir -p $out/share/icons @@ -21,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A colorful design icon theme for linux desktops"; - homepage = https://github.com/vinceliuice/Qogir-icon-theme; + homepage = "https://github.com/vinceliuice/Qogir-icon-theme"; license = with licenses; [ gpl3 ]; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; |