diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/data/icons')
9 files changed, 50 insertions, 25 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/data/icons/capitaine-cursors/default.nix b/infra/libkookie/nixpkgs/pkgs/data/icons/capitaine-cursors/default.nix index 09491b904ef1..e57482b191b7 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/icons/capitaine-cursors/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/icons/capitaine-cursors/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, fetchpatch, makeFontsConf , inkscape, xcursorgen, bc }: stdenv.mkDerivation rec { @@ -12,11 +12,23 @@ stdenv.mkDerivation rec { sha256 = "0652ydy73x29z7wc6ccyqihmfg4bk0ksl7yryycln6c7i0iqfmc9"; }; + patches = [ + # Fixes the build on inscape => 1.0, without this it generates empty cursor files + (fetchpatch { + name = "inkscape-1.0-compat"; + url = "https://github.com/keeferrourke/capitaine-cursors/commit/9da0b53e6098ed023c5c24c6ef6bfb1f68a79924.patch"; + sha256 = "0lx5i60ahy6a2pir4zzlqn5lqsv6claqg8mv17l1a028h9aha3cv"; + }) + ]; + postPatch = '' patchShebangs . ''; - buildInputs =[ + # Complains about not being able to find the fontconfig config file otherwise + FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; + + buildInputs = [ inkscape xcursorgen bc @@ -36,14 +48,10 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = '' - An x-cursor theme inspired by macOS and based on KDE Breeze - ''; + description = "An x-cursor theme inspired by macOS and based on KDE Breeze"; homepage = "https://github.com/keeferrourke/capitaine-cursors"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = with maintainers; [ - eadwu - ]; + maintainers = with maintainers; [ eadwu ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix b/infra/libkookie/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix index 8fe21aabe36f..165801f52eb8 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "iconpack-obsidian"; - version = "4.13"; + version = "4.14"; src = fetchFromGitHub { owner = "madmaxms"; repo = pname; rev = "v${version}"; - sha256 = "1hh0hnd2d08l4n5r73fkngv08f8230pp94k9qq8xgmchvjfg6j8y"; + sha256 = "1rhs8k88gh6673flr22cb3gbbw37wyzhd6jyysx6qgjjsnjvl2h8"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/infra/libkookie/nixpkgs/pkgs/data/icons/luna-icons/default.nix b/infra/libkookie/nixpkgs/pkgs/data/icons/luna-icons/default.nix index 3125df5fe1cf..2cbf1c506321 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/icons/luna-icons/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/icons/luna-icons/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "luna-icons"; - version = "2020-08-09"; + version = "0.6"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; - rev = "d32aacabcc018212c460833327e1b54a716a5a23"; - sha256 = "1f1ypxcvmd97afn7612i8gxmbrj80vx45vqrrh3n0p65jw5lg7zc"; + rev = version; + sha256 = "1lm7ws7in8cjjl38c7xw67jr42d717kk5kkfac7rprk0z7pb104l"; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cp -a Luna* $out/share/icons for theme in $out/share/icons/*; do - gtk-update-icon-cache $theme + gtk-update-icon-cache "$theme" done runHook postInstall diff --git a/infra/libkookie/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix b/infra/libkookie/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix index ee539981fbca..2a6dbc512acc 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix @@ -1,4 +1,12 @@ -{ stdenv, fetchFromGitLab, cmake, extra-cmake-modules, gtk3, kdeFrameworks, hicolor-icon-theme }: +{ stdenv +, fetchFromGitLab +, cmake +, extra-cmake-modules +, gtk3 +, plasma-framework +, kwindowsystem +, hicolor-icon-theme +}: stdenv.mkDerivation { pname = "maia-icon-theme"; @@ -17,8 +25,8 @@ stdenv.mkDerivation { cmake extra-cmake-modules gtk3 - kdeFrameworks.plasma-framework - kdeFrameworks.kwindowsystem + plasma-framework + kwindowsystem ]; propagatedBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/data/icons/numix-cursor-theme/default.nix b/infra/libkookie/nixpkgs/pkgs/data/icons/numix-cursor-theme/default.nix index d0411a8c5697..7ff3c4ca23c4 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/icons/numix-cursor-theme/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/icons/numix-cursor-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, inkscape, xcursorgen }: +{ stdenv, fetchFromGitHub, fetchpatch, inkscape, xcursorgen }: stdenv.mkDerivation rec { version = "1.1"; @@ -14,6 +14,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ inkscape xcursorgen ]; + patches = [ + # Remove when https://github.com/numixproject/numix-cursor-theme/pull/7 is merged + (fetchpatch { + url = "https://github.com/stephaneyfx/numix-cursor-theme/commit/3b647bf768cebb8f127b88e3786f6a9640460197.patch"; + sha256 = "174kmhlvv76wwvndkys78aqc32051sqg3wzc0xg6b7by4agrbg76"; + name = "support-inkscape-1-in-numix-cursor-theme.patch"; + }) + ]; + buildPhase = '' patchShebangs . HOME=$TMP ./build.sh diff --git a/infra/libkookie/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix b/infra/libkookie/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix index f43ca473f0dd..ef06c2e2532a 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "20.07.11"; + version = "20.09.19"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "0vj3d3wb12ksnkm99s32k7nrf9m5j83zzvkd0rwk8l0b30df975j"; + sha256 = "1rqlq5ssxqj0nc0i8av7zprj94km5645xzqi5j5i0sxd3jbmyfjx"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/infra/libkookie/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix b/infra/libkookie/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix index 51a2100d3aa3..b0b4e20073a4 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "20.07.11"; + version = "20.09.19"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "07jy8l2r6grn7pabn3dnkc8j7xdykl7k57br30c6v61ss8paf2rw"; + sha256 = "0afraarfcd66mpidmn0l90wif8kmwzdj3s09g704kwszyijxs80z"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/infra/libkookie/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix b/infra/libkookie/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix index 2a9a895b6caf..1d677f1457df 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qogir-icon-theme"; - version = "2020-06-22"; + version = "2020-11-22"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0s5fhwfhn4qgk198jw736byxdrfm42l5m681pllbhg02j8ld4iik"; + sha256 = "04rkpsiz8jg9i55mslsh7a6wgyp30ja3xss7qacqimdab236300d"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/infra/libkookie/nixpkgs/pkgs/data/icons/zafiro-icons/default.nix b/infra/libkookie/nixpkgs/pkgs/data/icons/zafiro-icons/default.nix index a8dc4539a7dd..d406ae50e1c3 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/icons/zafiro-icons/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/icons/zafiro-icons/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "zayronxio"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "05h8qm9izjbp8pnl9jpbw3y9sddhp0zmg94fm1k4d4hhdqnakqhv"; }; |