diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-23 18:01:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-23 18:01:10 +0000 |
| commit | a1d98b162f87b325e2119a7be0ec36430ca1687f (patch) | |
| tree | 55a2885541c98e38625f23a138e20865bf212fa1 /pkgs/data | |
| parent | 78b670898cf807274080cfc646a02c006d6d18d6 (diff) | |
| parent | e8ecc402a5ec3140a8484608fdecc01462af11f3 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/themes/nordic/default.nix | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix index 41189b21f4995..8d41ce5e38df6 100644 --- a/pkgs/data/themes/nordic/default.nix +++ b/pkgs/data/themes/nordic/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "nordic"; - version = "unstable-2021-11-19"; + version = "2.1.0"; srcs = [ (fetchFromGitHub { @@ -76,6 +76,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall + mkdir -p $out/share/themes cp -a Nordic* $out/share/themes rm -r $out/share/themes/*/.gitignore @@ -88,13 +89,23 @@ stdenv.mkDerivation rec { rm -r $out/share/themes/*/gnome-shell/{extensions,*.scss} rm -r $out/share/themes/*/gtk-2.0/{assets.svg,assets.txt,links.fish,render-assets.sh} rm -r $out/share/themes/*/gtk-3.0/{apps,widgets,*.scss} - rm -r $out/share/themes/*/kde rm -r $out/share/themes/*/xfwm4/{assets,render_assets.fish} + + # move kde related contents to appropriate directories + mkdir -p $out/share/{aurorae/themes,color-schemes,Kvantum,plasma,sddm/themes/Nordic} + mv -v $out/share/themes/Nordic/kde/aurorae/* $out/share/aurorae/themes/ + mv -v $out/share/themes/Nordic/kde/colorschemes/* $out/share/color-schemes/ + mv -v $out/share/themes/Nordic/kde/konsole $out/share/ + mv -v $out/share/themes/Nordic/kde/kvantum/* $out/share/Kvantum/ + mv -v $out/share/themes/Nordic/kde/plasma/look-and-feel $out/share/plasma/ + mv -v $out/share/themes/Nordic/kde/sddm/* $out/share/sddm/themes/Nordic/ + rm -rf $out/share/themes/Nordic/kde + runHook postInstall ''; meta = with lib; { - description = "Gtk themes using the Nord color pallete"; + description = "Gtk and KDE themes using the Nord color pallete"; homepage = "https://github.com/EliverLara/Nordic"; license = licenses.gpl3Only; platforms = platforms.all; |