From 98aaa39eb1cb8b0d0a6d0de316d2531712ad0c69 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Sun, 22 May 2022 11:05:08 +0800 Subject: [PATCH] neuwaita-icon-theme: rename from skeuowaita --- pkgs/default.nix | 2 +- pkgs/neuwaita-icon-theme/default.nix | 34 ++++++++++++++++++++++++++++ pkgs/skeuowaita-icon-theme.nix | 33 --------------------------- 3 files changed, 35 insertions(+), 34 deletions(-) create mode 100644 pkgs/neuwaita-icon-theme/default.nix delete mode 100644 pkgs/skeuowaita-icon-theme.nix diff --git a/pkgs/default.nix b/pkgs/default.nix index 91ba9465..4d4b2fbd 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -38,11 +38,11 @@ let mopidy-beets = callPackage ./mopidy-beets.nix { }; mopidy-funkwhale = callPackage ./mopidy-funkwhale.nix { }; mopidy-internetarchive = callPackage ./mopidy-internetarchive.nix { }; + neuwaita-icon-theme = callPackage ./neuwaita-icon-theme { }; pop-launcher = callPackage ./pop-launcher.nix { }; pop-launcher-plugin-duckduckgo-bangs = callPackage ./pop-launcher-plugin-duckduckgo-bangs.nix { }; #trex = callPackage ./trex.nix { }; - skeuowaita-icon-theme = callPackage ./skeuowaita-icon-theme.nix { }; text-engine = callPackage ./text-engine.nix { }; tic-80 = callPackage ./tic-80 { }; thokr = callPackage ./thokr.nix { }; diff --git a/pkgs/neuwaita-icon-theme/default.nix b/pkgs/neuwaita-icon-theme/default.nix new file mode 100644 index 00000000..d64f7cb6 --- /dev/null +++ b/pkgs/neuwaita-icon-theme/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }: + +stdenv.mkDerivation rec { + pname = "neuwaita-icon-theme"; + version = "unstable-2022-05-22"; + + src = fetchFromGitHub { + owner = "Ashwatthaamaa"; + repo = "Neuwaita"; + rev = "319b751aaeb268e5c70f0000b25eea050ce3a2ff"; + sha256 = "sha256-eRpy1UaPtKOTzIUjWOn9z8TbtiNLv//c77rYrV4FHmI="; + }; + + nativeBuildInputs = [ gtk3 ]; + propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ]; + dontDropIconThemeCache = true; + + installPhase = '' + runHook preInstall + + install -Dm644 index.theme -t $out/share/icons/neuwaita + cp -a scalable/ $out/share/icons/neuwaita + gtk-update-icon-cache $out/share/icons/neuwaita + + runHook postInstall + ''; + + meta = with lib; { + description = "A neumorphic take on Adwaita theme."; + homepage = "https://github.com/Ashwatthaamaa/Neuwaita"; + #license = licenses.cc0; + platforms = platforms.linux; + }; +} diff --git a/pkgs/skeuowaita-icon-theme.nix b/pkgs/skeuowaita-icon-theme.nix deleted file mode 100644 index bf821587..00000000 --- a/pkgs/skeuowaita-icon-theme.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, lib, fetchgit, gtk3, gnome-icon-theme, hicolor-icon-theme }: - -stdenv.mkDerivation rec { - pname = "skeuowaita-icon-theme"; - version = "unstable-2022-05-02"; - - src = fetchgit { - url = "https://gitlab.gnome.org/Conspiracy/skeuowaita.git"; - rev = "82e4b2e2bc5af4eb424061f4148f1dcac56a56d3"; - sha256 = "sha256-XnKnqE6qjKQQeIpZX5u298mbB7elsbkXmNYpgYefrNE="; - }; - - nativeBuildInputs = [ gtk3 ]; - propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ]; - dontDropIconThemeCache = true; - - installPhase = '' - runHook preInstall - - install -Dm644 index.theme -t $out/share/icons/skeuowaita - cp -a scalable/ $out/share/icons/skeuowaita - gtk-update-icon-cache $out/share/icons/skeuowaita - - runHook postInstall - ''; - - meta = with lib; { - description = "A skeuomorphic take on Adwaita theme."; - homepage = "https://gitlab.gnome.org/Conspiracy/skeuowaita"; - license = licenses.cc0; - platforms = platforms.linux; - }; -}