Integrating NixOS/nixpkgs#346043 for static binaries

nixie-dev · Oct 17, 2024 · f0e1bf3 · f0e1bf3
1 parent 01e2022
commit f0e1bf3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 41 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,6 +1,6 @@
 { description = "Put Nix in everything!";
 
-  inputs.nixpkgs.url = github:nixos/nixpkgs;
+  inputs.nixpkgs.url = github:nixos/nixpkgs/staging;
   inputs.nix.url = github:nixos/nix/2.17.1;
   inputs.fakedir =
     { url = github:nixie-dev/fakedir;

diff --git a/static-bins/default.nix b/static-bins/default.nix
@@ -25,17 +25,7 @@ let
   ];
   systemsPkgs =
     map (s:
-      import nixpkgs ({ localSystem = s; }
-      // (if s == "x86_64-darwin"
-          then
-          { overlays =
-            [ (import ./nixpkgs-darwin-static.nix) ];
-            crossSystem = {
-              isStatic = true;
-              system = s;
-            };
-          }
-          else {}))
+      import nixpkgs ({ localSystem = s; })
     ) builtSystems;
 
   nixPackage = r: if builtins.hasAttr "${r.system}" nixStatics

diff --git a/static-bins/nixpkgs-darwin-static.nix b/static-bins/nixpkgs-darwin-static.nix