summary refs log tree commit diff
diff options
context:
space:
mode:
-rwxr-xr-xflake.nix2
-rwxr-xr-xmodules/packages/gitfs.nix17
2 files changed, 11 insertions, 8 deletions
diff --git a/flake.nix b/flake.nix
index 1121bcd..11f7980 100755
--- a/flake.nix
+++ b/flake.nix
@@ -21,7 +21,7 @@
 
   # Outputs can be anything, but the wiki + some commands define their own
   # specific keys. Wiki page: https://nixos.wiki/wiki/Flakes#Output_schema
-  outputs = { self, nixpkgs, home-manager, botcore-v4, discord-client-proxy }: {
+  outputs = { self, nixpkgs, home-manager, botcore-v4 }: {
     # nixosConfigurations is the key that nixos-rebuild looks for.
     nixosConfigurations = {
       Rory-discordbots = nixpkgs.lib.nixosSystem {
diff --git a/modules/packages/gitfs.nix b/modules/packages/gitfs.nix
index 89bb2e2..804a747 100755
--- a/modules/packages/gitfs.nix
+++ b/modules/packages/gitfs.nix
@@ -2,13 +2,16 @@
 {
   environment.systemPackages = with pkgs; [
     (gitfs.overrideAttrs (old: {
-      patches = (old.patches or []) ++ [
-        (fetchpatch {
-          name = "fix-MutableMapping.patch";
-          url = "https://patch-diff.githubusercontent.com/raw/presslabs/gitfs/pull/382.diff";
-          hash = "sha256-ZaIEhv37sorSq3P+6GeH346u/5xh3qE+49D9FRNujMQ=";
-        })
-      ];
+  # TODO: pls fix the nixpkgs derivation
+  patchPhase = null;
+  postPatch = old.patchPhase;
+  patches = (old.patches or []) ++ [
+    (fetchpatch {
+      name = "fix-MutableMapping.patch";
+      url = "https://patch-diff.githubusercontent.com/raw/presslabs/gitfs/pull/382.diff";
+      hash = "sha256-ZaIEhv37sorSq3P+6GeH346u/5xh3qE+49D9FRNujMQ=";
     })
+  ];
+})
   )];
 }