fix nix patches

flake.nix

@@ -6,6 +6,7 @@
     nixpkgs-master.url = "github:nixos/nixpkgs/master";
     # nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-21.05";
     nixpkgs-stable.url = "github:nixos/nixpkgs/51bcdc4cdaac48535dabf0ad4642a66774c609ed";
+    nix.url = "github:nixos/nix";
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -128,7 +129,7 @@
           in nixosSystem {
               system = system;
               modules = [ (import (./machines + "/${name}")) { device = name; } ];
-              specialArgs = { inherit inputs system; };
+              specialArgs = { inherit inputs; };
             };
         in genAttrs hosts mkHost;
 

profiles/nix/default.nix

@@ -21,9 +21,8 @@
 
     autoOptimiseStore = false;
 
-    package = inputs.nix.defaultPackage.${system}.overrideAttrs (oa: {
+    package = inputs.nix.defaultPackage.${pkgs.system}.overrideAttrs (oa: {
-      patches = [ ./nix.patch ./unset-is-macho.patch ] ++ oa.patches or [ ];
+      patches = [ ./nix.patch ] ++ oa.patches or [ ];
-      doInstallCheck = false;
     });
 
     extraOptions = ''

profiles/nix/unset-is-macho.patch

@@ -1,13 +0,0 @@
-diff --git a/src/nix/get-env.sh b/src/nix/get-env.sh
-index 42c806450..a8563c772 100644
---- a/src/nix/get-env.sh
-+++ b/src/nix/get-env.sh
-@@ -8,6 +8,8 @@ if [[ -n $stdenv ]]; then
-     source $stdenv/setup
- fi
-
-+unset -f isMachO
-+
- # Better to use compgen, but stdenv bash doesn't have it.
- __vars="$(declare -p)"
- __functions="$(declare -F)"