Restore aarch64-linux NixOS/nixpkgs#209834 workaround

nixie-dev · Dec 13, 2023 · 8e5c4ff · 8e5c4ff
1 parent f830083
commit 8e5c4ff
Show file tree

Hide file tree

Showing 2 changed files with 91 additions and 2 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,6 +1,7 @@
 { description = "Put Nix in everything!";
 
  inputs.nixpkgs.url = github:nixos/nixpkgs;
+ inputs.nix.url = github:nixos/nix/2.17.1;
  inputs.fakedir =
  { url = github:nixie-dev/fakedir;
  inputs.nixpkgs.follows = "nixpkgs";
@@ -10,7 +11,7 @@
  nixConfig.extra-substituters = "https://nix-wrap.cachix.org";
  nixConfig.extra-trusted-public-keys = "nix-wrap.cachix.org-1:FcfSb7e+LmXBZE/MdaFWcs4bW2OQQeBnB/kgWlkZmYI=";
 
- outputs = { self, nixpkgs, flake-utils, fakedir, ... }:
+ outputs = { self, nix, nixpkgs, flake-utils, fakedir, ... }:
  flake-utils.lib.eachDefaultSystem
  (system:
  let pkgs = import nixpkgs { inherit system; };
@@ -22,6 +23,7 @@
  static-bins = import ./static-bins
  { inherit nixpkgs fakedir pkgs;
  libfakedir = fakedir.packages.aarch64-darwin.fakedir-universal;
+ nixStatics.aarch64-linux = nix.packages.aarch64-linux.nix-static;
  };
 
  } // (if system == "x86_64-darwin" || system == "aarch64-darwin"