about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/aszlig/rustfmt/config.patch6
-rw-r--r--pkgs/aszlig/rustfmt/default.nix1
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/aszlig/rustfmt/config.patch b/pkgs/aszlig/rustfmt/config.patch
index 0a49a585..6864b797 100644
--- a/pkgs/aszlig/rustfmt/config.patch
+++ b/pkgs/aszlig/rustfmt/config.patch
@@ -1,7 +1,7 @@
-diff --git a/src/config/mod.rs b/src/config/mod.rs
+diff --git a/src/tools/rustfmt/src/config/mod.rs b/src/tools/rustfmt/src/config/mod.rs
 index cd90e090..a6db6da1 100644
---- a/src/config/mod.rs
-+++ b/src/config/mod.rs
+--- a/src/tools/rustfmt/src/config/mod.rs
++++ b/src/tools/rustfmt/src/config/mod.rs
 @@ -282,7 +282,7 @@ impl Config {
                  }
              }
diff --git a/pkgs/aszlig/rustfmt/default.nix b/pkgs/aszlig/rustfmt/default.nix
index cde4d010..ab8ecb41 100644
--- a/pkgs/aszlig/rustfmt/default.nix
+++ b/pkgs/aszlig/rustfmt/default.nix
@@ -20,7 +20,6 @@ let
 
 in rustfmt.overrideAttrs (drv: {
   patches = (drv.patches or []) ++ [ ./config.patch ];
-  patchFlags = [ "-p1" "-d" "src/tools/rustfmt" ];
   DEFAULT_CONFIG_FILE = runCommand "rustfmt.conf" {
     nativeBuildInputs = [ remarshal ];
     value = builtins.toJSON defaultConfig;