tinc_pre: fix merge

NixOS · Jul 28, 2017 · a8dd453 · a8dd453
1 parent ab12e82
commit a8dd453
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix
@@ -15,13 +15,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook texinfo ];
   buildInputs = [ ncurses readline zlib lzo openssl ];
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/gsliepen/tinc/commit/323c17e232539f3f06e7cebc664ab48f60127e0e.patch";
-      sha256 = "1flnprxa0gviiih0lbpqa5kj41ndh1sylm5j9ibly7f8m5rg16rs";
-    })
-  ];
-
   prePatch = ''
     substituteInPlace configure.ac --replace UNKNOWN ${version}
   '';
@@ -32,6 +25,10 @@ stdenv.mkDerivation rec {
       url = https://github.com/gsliepen/tinc/compare/acefa66...e4544db.patch;
       sha256 = "1jz7anqqzk7j96l5ifggc2knp14fmbsjdzfrbncxx0qhb6ihdcvn";
     })
+    (fetchpatch {
+      url = "https://github.com/gsliepen/tinc/commit/323c17e232539f3f06e7cebc664ab48f60127e0e.patch";
+      sha256 = "1flnprxa0gviiih0lbpqa5kj41ndh1sylm5j9ibly7f8m5rg16rs";
+    })
   ];
 
   postInstall = ''