Patch nix instead of using an override unit

2023-09-18 18:06:51 +02:00
parent 1fc6891dc6
commit 77b41a90e2
3 changed files with 26 additions and 3 deletions
--- a/pkgs/nix-socket.patch
+++ b/pkgs/nix-socket.patch
@@ -0,0 +1,11 @@
+--- a/misc/systemd/nix-daemon.socket.in	1970-01-01 01:00:01.000000000 +0100
+++ b/misc/systemd/nix-daemon.socket.in	2023-09-18 17:53:32.351760208 +0200
+@@ -1,7 +1,7 @@
+ [Unit]
+ Description=Nix Daemon Socket
+ Before=multi-user.target
+-RequiresMountsFor=@storedir@
+RequiresMountsFor=@localstatedir@
+ ConditionPathIsReadWrite=@localstatedir@/nix/daemon-socket
+ 
+ [Socket]
--- a/pkgs/overlay.nix
+++ b/pkgs/overlay.nix
@@ -32,4 +32,8 @@ final: prev:
    lua = prev.lua5_4;
    fmt = prev.fmt_8;
  }) ceph ceph-client;
+
+  nix = prev.nix.overrideAttrs (old: {
+    patches = old.patches ++ [ ./nix-socket.patch ];
+  });
 }