From 0452b58f0fac57b50291de9b541e47388ccea7e1 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 28 Apr 2016 18:36:09 +0200
Subject: [PATCH] gobject-introspection: fix on darwin

---
 .../gobject-introspection/darwin-fixups.patch | 26 -------------------
 .../gobject-introspection/default.nix         |  3 ---
 2 files changed, 29 deletions(-)
 delete mode 100644 pkgs/development/libraries/gobject-introspection/darwin-fixups.patch

diff --git a/pkgs/development/libraries/gobject-introspection/darwin-fixups.patch b/pkgs/development/libraries/gobject-introspection/darwin-fixups.patch
deleted file mode 100644
index 02443d56afab..000000000000
--- a/pkgs/development/libraries/gobject-introspection/darwin-fixups.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur gobject-introspection-1.46.0-orig/giscanner/ccompiler.py gobject-introspection-1.46.0/giscanner/ccompiler.py
---- gobject-introspection-1.46.0-orig/giscanner/ccompiler.py	2016-02-01 12:25:41.000000000 -0500
-+++ gobject-introspection-1.46.0/giscanner/ccompiler.py	2016-02-01 15:50:36.000000000 -0500
-@@ -128,11 +128,7 @@
-                     self.compiler.add_runtime_library_dir('.')
- 
-                 # https://bugzilla.gnome.org/show_bug.cgi?id=625195
--                args.append('-Wl,-rpath=.')
--
--                # Ensure libraries are always linked as we are going to use ldd to work
--                # out their names later
--                args.append('-Wl,--no-as-needed')
-+                args.append('-Wl,-rpath,.')
- 
-             for library in libraries:
-                 self.compiler.add_library(library)
-@@ -140,7 +136,7 @@
-                 for library_path in libpaths:
-                     args.append('-L' + library_path)
-                     if os.path.isabs(library_path):
--                        args.append('-Wl,-rpath=' + library_path)
-+                        args.append('-Wl,-rpath,' + library_path)
- 
-         else:
-             # libtool case: assemble linker command arguments, like we did before
-Only in gobject-introspection-1.46.0/giscanner: ccompiler.py~
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 55abb21845b9..0b48ef076b1f 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -40,9 +40,6 @@ stdenv.mkDerivation rec {
   patches = stdenv.lib.singleton (substituteAll {
     src = ./absolute_shlib_path.patch;
     inherit nixStoreDir;
-  }) ++ optional stdenv.isDarwin (substituteAll {
-    src = ./darwin-fixups.patch;
-    inherit nixStoreDir;
   });
 
   meta = with stdenv.lib; {