refactor overlay

flake.lock

@@ -2,16 +2,16 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1687288566,
+        "lastModified": 1722372011,
-        "narHash": "sha256-VckkiJ88Gzdc2cstm0z5eFcrHbvkm4VjxavHBGssvZI=",
+        "narHash": "sha256-B2xRiC3NEJy/82ugtareBkRqEkPGpMyjaLxaR8LBxNs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b6c73c5fe53bb3afbf65e870541e0645e9145171",
+        "rev": "cf05eeada35e122770c5c14add958790fcfcbef5",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.05",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -1,26 +1,16 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
   };
 
   outputs = { self, nixpkgs }:
     let
       system = "x86_64-linux";
-      pkgs = nixpkgs.legacyPackages.${system};
+      overlay = import ./overlay.nix;
-      atauPkgs = {
+      pkgs = import nixpkgs { inherit system; overlays = [ overlay ]; };
-        atau-wallpapers = pkgs.callPackage ./atau-wallpapers { };
-        theme-platinum9 = pkgs.callPackage ./theme-platinum9 { };
-        gtk-theme-mac-os-9 = pkgs.callPackage ./gtk-theme-mac-os-9 { };
-        nineicons-redux = pkgs.callPackage ./nineicons-redux { };
-      };
     in
     {
-      packages.${system} = {
+      packages.${system} = pkgs;
-        default = atauPkgs.theme-platinum9;
+      overlays.default = overlay;
-      } // atauPkgs;
-
-      overlays.default = final: prev: {
-        atau-pkgs = atauPkgs;
-      };
     };
 }

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
 

overlay.nix

@@ -0,0 +1,8 @@
+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 { };
+  };
+}

theme-platinum9/default.nix

@@ -1,6 +1,6 @@
-{ lib, stdenv }:
+{ lib, stdenvNoCC, gtk3, hicolor-icon-theme }:
 
-stdenv.mkDerivation rec {
+stdenvNoCC.mkDerivation rec {
   name = "theme-platinum9";
   pname = name;
   version = "d3d2080c1a2d5772714d089d1dc1daeeb41db008";
@@ -10,6 +10,10 @@ stdenv.mkDerivation rec {
     rev = version;
   };
 
+  nativeBuildInputs = [
+    gtk3
+  ];
+
   installPhase = ''
     runHook preInstall
 
@@ -19,19 +23,21 @@ stdenv.mkDerivation rec {
     mv PlatiPlus "$out/share/themes"
     mv PlatiPlus26 "$out/share/themes"
 
-    # Install icons
+    chmod 644 -R $out/share/themes
-    # mkdir -p "$out/share/icons"
-    # mv NineIcons/ "$out/share/icons" 
 
     # 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
   '';