Merge pull request #18 from nrdxp/multiArch

initial multiArch support
divnix · Dec 28, 2020 · 766b54b · 766b54b
2 parents bd9367b + 7a6e725
commit 766b54b
Show file tree

Hide file tree

Showing 9 changed files with 76 additions and 28 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -6,15 +6,17 @@
       master.url = "nixpkgs/master";
       nixos.url = "nixpkgs/release-20.09";
       home.url = "github:nix-community/home-manager/release-20.09";
+      flake-utils.url = "github:numtide/flake-utils";
     };
 
-  outputs = inputs@{ self, home, nixos, master, nur }:
+  outputs = inputs@{ self, home, nixos, master, flake-utils, nur }:
     let
-      inherit (builtins) attrNames attrValues readDir;
+      inherit (builtins) attrNames attrValues readDir elem;
+      inherit (flake-utils.lib) eachDefaultSystem;
       inherit (nixos) lib;
-      inherit (lib) removeSuffix recursiveUpdate genAttrs filterAttrs;
+      inherit (lib) all removeSuffix recursiveUpdate genAttrs filterAttrs;
       inherit (utils) pathsToImportedAttrs genPkgset overlayPaths modules
-        genPackages;
+        genPackages pkgImport;
 
       utils = import ./lib/utils.nix { inherit lib; };
 
@@ -27,33 +29,57 @@
         genPkgset {
           inherit master nixos overlays system;
         };
-    in
-    with pkgset;
-    {
-      nixosConfigurations =
-        import ./hosts (recursiveUpdate inputs {
-          inherit lib pkgset system utils;
-        });
 
-      devShell."${system}" = import ./shell.nix {
-        pkgs = osPkgs;
-      };
+      outputs = {
+        nixosConfigurations =
+          import ./hosts (recursiveUpdate inputs {
+            inherit lib pkgset system utils;
+          });
 
-      overlay = import ./pkgs;
+        overlay = import ./pkgs;
 
-      overlays = pathsToImportedAttrs overlayPaths;
+        overlays = pathsToImportedAttrs overlayPaths;
 
-      packages."${system}" = genPackages {
-        overlay = self.overlay;
-        overlays = self.overlays;
-        pkgs = osPkgs;
-      };
+        nixosModules = modules;
 
-      nixosModules = modules;
+        templates.flk.path = ./.;
 
-      templates.flk.path = ./.;
-      templates.flk.description = "flk template";
+        templates.flk.description = "flk template";
 
-      defaultTemplate = self.templates.flk;
-    };
+        defaultTemplate = self.templates.flk;
+      };
+    in
+    (eachDefaultSystem (system':
+      let
+        pkgs' = pkgImport {
+          pkgs = nixos;
+          system = system';
+          overlays = [ ];
+        };
+      in
+      {
+        devShell = import ./shell.nix {
+          pkgs = pkgs';
+        };
+
+        packages =
+          let
+            packages' = genPackages {
+              overlay = self.overlay;
+              overlays = self.overlays;
+              pkgs = pkgs';
+            };
+
+            filtered = filterAttrs
+              (_: v:
+                (v.meta ? platforms)
+                && (elem system' v.meta.platforms)
+                && (
+                  (all (dev: dev.meta ? platforms) v.buildInputs)
+                  && (all (dev: elem system' dev.meta.platforms) v.buildInputs)
+                ))
+              packages';
+          in
+          filtered;
+      })) // outputs;
 }
diff --git a/pkgs/applications/blockchains/miningcore/default.nix b/pkgs/applications/blockchains/miningcore/default.nix
@@ -98,6 +98,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/akshaynexus/miningcore";
     license = licenses.mit;
     maintainers = with maintainers; [ nrdxp ];
-    platforms = [ "x86_64-linux" ];
+    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
   };
 }
diff --git a/pkgs/applications/display-managers/sddm/themes/chili/default.nix b/pkgs/applications/display-managers/sddm/themes/chili/default.nix
@@ -19,10 +19,11 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "The hottest theme around for SDDM";
     homepage = "https://github.com/MarianArlt/sddm-chili";
     maintainers = [ maintainers.nrdxp ];
     license = licenses.gpl3;
-    inherit version;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/window-managers/steamcompmgr/default.nix b/pkgs/applications/window-managers/steamcompmgr/default.nix
@@ -41,6 +41,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/steamos-compositor-plus";
     maintainers = [ maintainers.nrdxp ];
     license = licenses.bsd2;
+    platforms = platforms.linux;
     inherit version;
   };
 }
diff --git a/pkgs/data/fonts/dejavu-nerdfont/default.nix b/pkgs/data/fonts/dejavu-nerdfont/default.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/ryanoasis/nerd-fonts";
     license = licenses.mit;
     maintainers = [ maintainers.nrdxp ];
+    platforms = platforms.unix;
     inherit version;
   };
 }
diff --git a/pkgs/misc/drivers/wii-u-gc-adapter/default.nix b/pkgs/misc/drivers/wii-u-gc-adapter/default.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/ToadKing/wii-u-gc-adapter";
     maintainers = [ maintainers.nrdxp ];
     license = licenses.mit;
+    platforms = platforms.linux;
     inherit version;
   };
 }
diff --git a/pkgs/shells/zsh/pure/default.nix b/pkgs/shells/zsh/pure/default.nix
@@ -23,6 +23,7 @@ stdenv.mkDerivation {
     description = "Pretty, minimal and fast ZSH prompt";
     homepage = "https://github.com/sindresorhus/pure";
     maintainers = [ maintainers.nrdxp ];
+    platforms = platforms.unix;
     license = licenses.mit;
     inherit version;
   };

diff --git a/pkgs/shells/zsh/purs/default.nix b/pkgs/shells/zsh/purs/default.nix
@@ -33,6 +33,7 @@ buildRustPackage {
     homepage = "https://github.com/xcambar/purs";
     maintainers = [ maintainers.nrdxp ];
     license = licenses.mit;
+    platforms = platforms.unix;
     inherit version;
   };
 }