refactor(nix): don't instantiate nixpkgs

See https://zimbatm.com/notes/1000-instances-of-nixpkgs Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
PrismLauncher · Aug 28, 2023 · 70fb3d8 · 70fb3d8
1 parent e4e4c4a
commit 70fb3d8
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 37 deletions.
diff --git a/flake.nix b/flake.nix
@@ -23,5 +23,17 @@
   outputs = inputs:
     inputs.flake-parts.lib.mkFlake
     {inherit inputs;}
-    {imports = [./nix];};
+    {
+      imports = [
+        ./nix/dev.nix
+        ./nix/distribution.nix
+      ];
+
+      systems = [
+        "x86_64-linux"
+        "aarch64-linux"
+        "x86_64-darwin"
+        "aarch64-darwin"
+      ];
+    };
 }
diff --git a/nix/default.nix b/nix/default.nix
diff --git a/nix/package.nix → nix/derivation.nix b/nix/package.nix → nix/derivation.nix
diff --git a/nix/distribution.nix b/nix/distribution.nix
@@ -1,21 +1,24 @@
 {
   inputs,
   self,
-  version,
   ...
 }: {
   perSystem = {pkgs, ...}: {
-    packages = {
-      inherit (pkgs) prismlauncher-qt5-unwrapped prismlauncher-qt5 prismlauncher-unwrapped prismlauncher;
-      default = pkgs.prismlauncher;
+    packages = let
+      ourPackages = self.overlays.default pkgs pkgs;
+    in {
+      inherit (ourPackages) prismlauncher-qt5-unwrapped prismlauncher-qt5 prismlauncher-unwrapped prismlauncher;
+      default = ourPackages.prismlauncher;
     };
   };
 
   flake = {
     overlays.default = final: prev: let
+      version = builtins.substring 0 8 self.lastModifiedDate;
+
       # Helper function to build prism against different versions of Qt.
       mkPrism = qt:
-        qt.callPackage ./package.nix {
+        qt.callPackage ./derivation.nix {
           inherit (inputs) libnbtplusplus;
           inherit (prev.darwin.apple_sdk.frameworks) Cocoa;
           inherit self version;