diff --git a/flake.nix b/flake.nix index d54f293..0925ca1 100644 --- a/flake.nix +++ b/flake.nix @@ -8,17 +8,6 @@ system = "x86_64-linux"; overlay = import ./overlay.nix; pkgs = import nixpkgs { inherit system; overlays = [ overlay ]; }; - - # test = pkgs.adwaita-icon-theme; - # atauPkgs = { - # atau-wallpapers = pkgs.callPackage ./atau-wallpapers { }; - # # theme-platinum9 = pkgs.callPackage ./theme-platinum9 { - # # adwaita-icon-theme = test; - # # }; - - # gtk-theme-mac-os-9 = pkgs.callPackage./gtk-theme-mac-os-9 { }; - # nineicons-redux = pkgs.callPackage./nineicons-redux { }; - # }; in { packages.${system} = pkgs; diff --git a/nineicons-redux/default.nix b/nineicons-redux/default.nix index a9f8fd9..76ff8ff 100644 --- a/nineicons-redux/default.nix +++ b/nineicons-redux/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv }: +{ lib, stdenvNoCC }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { name = "nineicons-redux"; pname = name; version = "3cc6c532a2fcbfa2d9d15b91f7fbc0a98ddb5cf3"; @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { rev = version; }; + dontDropIconThemeCache = true; + installPhase = '' runHook preInstall diff --git a/overlay.nix b/overlay.nix index 4b6939d..0984519 100644 --- a/overlay.nix +++ b/overlay.nix @@ -2,6 +2,7 @@ prev: final: { atau-pkgs = { atau-wallpapers = final.callPackage ./atau-wallpapers { }; gtk-theme-mac-os-9 = final.callPackage ./gtk-theme-mac-os-9 { }; + theme-platinum9 = final.callPackage ./theme-platinum9 { }; nineicons-redux = final.callPackage ./nineicons-redux { }; }; } diff --git a/theme-platinum9/default.nix b/theme-platinum9/default.nix index f651406..f2dea67 100644 --- a/theme-platinum9/default.nix +++ b/theme-platinum9/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, gtk3, adwaita-icon-theme, ... }: +{ lib, stdenvNoCC, gtk3, hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { name = "theme-platinum9"; pname = name; version = "d3d2080c1a2d5772714d089d1dc1daeeb41db008"; @@ -14,13 +14,6 @@ stdenv.mkDerivation rec { gtk3 ]; - propagatedBuildInputs = [ - adwaita-icon-theme - # hicolor-icon-theme - ]; - - dontDropIconThemeCache = true; - installPhase = '' runHook preInstall @@ -30,23 +23,21 @@ stdenv.mkDerivation rec { mv PlatiPlus "$out/share/themes" mv PlatiPlus26 "$out/share/themes" - # Install icons - mkdir -p "$out/share/icons" - mv NineIcons/ "$out/share/icons" - - for theme in $out/share/icons/*; do - gtk-update-icon-cache "$theme" - done + chmod 644 -R $out/share/themes # Install fonts mkdir -p "$out/share/fonts/truetype" mv Charcoal.ttf "$out/share/fonts/truetype" mv MONACO.TTF "$out/share/fonts/truetype" + chmod 644 -R $out/share/fonts + # Install wallpapers mkdir -p "$out/share/backgrounds" mv OS9-wallpaper/ "$out/share/backgrounds" + chmod 644 -R $out/share/backgrounds + runHook postInstall '';