From 878544e4f6a9b60cad055e1f1e353d3b956f343a Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Tue, 29 Dec 2015 21:01:19 -0500
Subject: [PATCH] perl-5.2{0,2}: remove unnecessary patch for darwin

The patch no longer applies on 5.20 and is breaking everything. I tried
building both 5.20 and 5.22 and both seemed to work fine without the
patch.
---
 .../development/interpreters/perl/5.20/default.nix |  2 +-
 .../interpreters/perl/5.20/no-libutil.patch        | 12 ------------
 .../development/interpreters/perl/5.22/default.nix |  2 +-
 .../interpreters/perl/5.22/no-libutil.patch        | 14 --------------
 4 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/development/interpreters/perl/5.20/no-libutil.patch
 delete mode 100644 pkgs/development/interpreters/perl/5.22/no-libutil.patch

diff --git a/pkgs/development/interpreters/perl/5.20/default.nix b/pkgs/development/interpreters/perl/5.20/default.nix
index 659fad6bb9b..9cc8af5f427 100644
--- a/pkgs/development/interpreters/perl/5.20/default.nix
+++ b/pkgs/development/interpreters/perl/5.20/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
       ./no-sys-dirs.patch
     ]
     ++ optional stdenv.isSunOS ./ld-shared.patch
-    ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ] ;
+    ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ];
 
   # There's an annoying bug on sandboxed Darwin in Perl's Cwd.pm where it looks for pwd
   # in /bin/pwd and /usr/bin/pwd and then falls back on just "pwd" if it can't get them
diff --git a/pkgs/development/interpreters/perl/5.20/no-libutil.patch b/pkgs/development/interpreters/perl/5.20/no-libutil.patch
deleted file mode 100644
index 68d44612bfe..00000000000
--- a/pkgs/development/interpreters/perl/5.20/no-libutil.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure
---- perl-5.14.2-orig/Configure	2011-09-26 11:44:34.000000000 +0200
-+++ perl-5.14.2/Configure	2012-02-16 17:24:50.779839039 +0100
-@@ -1368,7 +1368,7 @@
- : List of libraries we want.
- : If anyone needs extra -lxxx, put those in a hint file.
- libswanted="socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun"
--libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD"
-+libswanted="$libswanted m crypt sec c cposix posix ucb bsd BSD"
- : We probably want to search /usr/shlib before most other libraries.
- : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
- glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
diff --git a/pkgs/development/interpreters/perl/5.22/default.nix b/pkgs/development/interpreters/perl/5.22/default.nix
index 53e777c19a1..34a26023adf 100644
--- a/pkgs/development/interpreters/perl/5.22/default.nix
+++ b/pkgs/development/interpreters/perl/5.22/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
       ./no-sys-dirs.patch
     ]
     ++ optional stdenv.isSunOS ./ld-shared.patch
-    ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ];
+    ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ];
 
   # Build a thread-safe Perl with a dynamic libperls.o.  We need the
   # "installstyle" option to ensure that modules are put under
diff --git a/pkgs/development/interpreters/perl/5.22/no-libutil.patch b/pkgs/development/interpreters/perl/5.22/no-libutil.patch
deleted file mode 100644
index d6356a52437..00000000000
--- a/pkgs/development/interpreters/perl/5.22/no-libutil.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/Configure b/Configure
-index 0a405d3..1871298 100755
---- a/Configure
-+++ b/Configure
-@@ -1455,7 +1455,7 @@ libswanted_uselargefiles=''
- : List of libraries we want.
- : If anyone needs extra -lxxx, put those in a hint file.
- libswanted="cl pthread socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld"
--libswanted="$libswanted sun m crypt sec util c cposix posix ucb bsd BSD"
-+libswanted="$libswanted sun m crypt sec c cposix posix ucb bsd BSD"
- : We probably want to search /usr/shlib before most other libraries.
- : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
- glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
-