diff options
author | José Romildo Malaquias <malaquias@gmail.com> | 2022-11-09 21:57:35 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-10 01:57:35 +0100 |
commit | c588a77cd54fbdbe874ddd1e63656d5fd69c6ae6 (patch) | |
tree | 14e70f232fb2163717fe0d43291876bca3b72ac1 | |
parent | d4926fc87fcbedf3e7485486c0e1bd58624d49d2 (diff) |
tela-circle-icon-theme: 2022-03-07 -> 2022-11-06 (#200377)
-rw-r--r-- | pkgs/data/icons/tela-circle-icon-theme/default.nix | 18 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 15 insertions, 7 deletions
diff --git a/pkgs/data/icons/tela-circle-icon-theme/default.nix b/pkgs/data/icons/tela-circle-icon-theme/default.nix index 44e8fdb6c05fa..7f7dc0d043f3b 100644 --- a/pkgs/data/icons/tela-circle-icon-theme/default.nix +++ b/pkgs/data/icons/tela-circle-icon-theme/default.nix @@ -1,6 +1,8 @@ { lib , stdenvNoCC , fetchFromGitHub +, adwaita-icon-theme +, breeze-icons , gtk3 , hicolor-icon-theme , jdupes @@ -13,17 +15,17 @@ let pname = "tela-circle-icon-theme"; in -lib.checkListOfEnum "${pname}: color variants" [ "standard" "black" "blue" "brown" "green" "grey" "orange" "pink" "purple" "red" "yellow" "manjaro" "ubuntu" ] colorVariants +lib.checkListOfEnum "${pname}: color variants" [ "standard" "black" "blue" "brown" "green" "grey" "orange" "pink" "purple" "red" "yellow" "manjaro" "ubuntu" "dracula" "nord" ] colorVariants stdenvNoCC.mkDerivation rec { inherit pname; - version = "2022-03-07"; + version = "2022-11-06"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "vQeWGZmurvT/UQJ1dx6t+ZeKdJ1Oq9TdHBADw64x18g="; + sha256 = "ybp+r0Ru2lJg1WipFHIowvRO5XjppI0cUxKc6kPn0lM="; }; nativeBuildInputs = [ @@ -32,6 +34,8 @@ stdenvNoCC.mkDerivation rec { ]; propagatedBuildInputs = [ + adwaita-icon-theme + breeze-icons hicolor-icon-theme ]; @@ -42,16 +46,18 @@ stdenvNoCC.mkDerivation rec { dontPatchELF = true; dontRewriteSymlinks = true; + postPatch = '' + patchShebangs install.sh + ''; + installPhase = '' runHook preInstall - patchShebangs install.sh - ./install.sh -d $out/share/icons \ ${lib.optionalString circularFolder "-c"} \ ${if allColorVariants then "-a" else builtins.toString colorVariants} - jdupes --link-soft --recurse $out/share + jdupes --quiet --link-soft --recurse $out/share runHook postInstall ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70d0aa64c71ce..cdf564bd76444 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26943,7 +26943,9 @@ with pkgs; theano = callPackage ../data/fonts/theano { }; - tela-circle-icon-theme = callPackage ../data/icons/tela-circle-icon-theme { }; + tela-circle-icon-theme = callPackage ../data/icons/tela-circle-icon-theme { + inherit (gnome) adwaita-icon-theme; + }; tela-icon-theme = callPackage ../data/icons/tela-icon-theme { }; |