From 0dad4dd29a2ae05bc6cedcbd745e014b6ec7421a Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Fri, 19 Nov 2021 14:20:12 +0100
Subject: [PATCH] Use patched nix

---
 overlays/10-previews.nix | 10 +++++++++-
 overlays/pkgSets.nix     |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/overlays/10-previews.nix b/overlays/10-previews.nix
index 5d69144c..ef1748a7 100644
--- a/overlays/10-previews.nix
+++ b/overlays/10-previews.nix
@@ -5,7 +5,15 @@ in
 {
   inherit unstable;
   inherit (unstable) cachix nix-output-monitor cabal2nix;
-  nix = unstable.nix;
+  nix = super.nix.overrideAttrs (o: {
+    patches = (o.patches or [ ]) ++ [
+      (super.fetchpatch {
+        # Overridable cache priorities
+        url = "https://github.com/NixOS/nix/commit/f8abbdd4565542464f31f4dc203a9c3e091b3536.patch";
+        sha256 = "0vbxiab0wd55ccnxkbi86lzmyrvjw946r9scxgq59xiyyss420rl";
+      })
+    ];
+  });
   unstableHaskellPackages = unstable.haskellPackages;
   unstableGhc = unstable.ghc;
   mautrix-signal = unstable.mautrix-signal;
diff --git a/overlays/pkgSets.nix b/overlays/pkgSets.nix
index 62d47fe3..2e106e27 100644
--- a/overlays/pkgSets.nix
+++ b/overlays/pkgSets.nix
@@ -1,6 +1,6 @@
 self: super: {
   # pkgs assumed to be present on a non nixos host
-  nixFlakes = self.writeShellScriptBin "flix" ''exec ${self.nix}/bin/nix --experimental-features "nix-command flakes" --log-format bar-with-logs "$@"'';
+  nixFlakes = self.writeShellScriptBin "flix" ''exec ${self.unstable.nix}/bin/nix --experimental-features "nix-command flakes" --log-format bar-with-logs "$@"'';
   core-system-pkgs = {
     inherit (self)
       gitFull gnumake mkpasswd file wget curl wireguard gnupg mutt bind liboping