From 2c80906ba92c7dcbf897a7acbaf1afae8aab25bd Mon Sep 17 00:00:00 2001
From: Dmitriy Kholkin <alukard.develop@gmail.com>
Date: Wed, 17 Nov 2021 05:09:46 +0300
Subject: [PATCH] fix nix patches

---
 flake.nix                         |  3 ++-
 profiles/nix/default.nix          |  5 ++---
 profiles/nix/unset-is-macho.patch | 13 -------------
 3 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 profiles/nix/unset-is-macho.patch

diff --git a/flake.nix b/flake.nix
index cb7e6e6..d969265 100644
--- a/flake.nix
+++ b/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;
 
diff --git a/profiles/nix/default.nix b/profiles/nix/default.nix
index a99e13b..59dbf30 100644
--- a/profiles/nix/default.nix
+++ b/profiles/nix/default.nix
@@ -21,9 +21,8 @@
 
     autoOptimiseStore = false;
 
-    package = inputs.nix.defaultPackage.${system}.overrideAttrs (oa: {
-      patches = [ ./nix.patch ./unset-is-macho.patch ] ++ oa.patches or [ ];
-      doInstallCheck = false;
+    package = inputs.nix.defaultPackage.${pkgs.system}.overrideAttrs (oa: {
+      patches = [ ./nix.patch ] ++ oa.patches or [ ];
     });
 
     extraOptions = ''
diff --git a/profiles/nix/unset-is-macho.patch b/profiles/nix/unset-is-macho.patch
deleted file mode 100644
index f79c578..0000000
--- a/profiles/nix/unset-is-macho.patch
+++ /dev/null
@@ -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)"
\ No newline at end of file