diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2016-04-28 18:36:09 +0200 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2016-04-28 18:36:09 +0200 |
| commit | 0452b58f0fac57b50291de9b541e47388ccea7e1 (patch) | |
| tree | 91f87382d2f883445ffd125cebdc5f5da1d9c8f0 /pkgs/development/libraries/gobject-introspection | |
| parent | f5038319560320abbdd0e802b3aa131f20ec4ba8 (diff) | |
| download | nixpkgs-0452b58f0fac57b50291de9b541e47388ccea7e1.tar nixpkgs-0452b58f0fac57b50291de9b541e47388ccea7e1.tar.gz nixpkgs-0452b58f0fac57b50291de9b541e47388ccea7e1.tar.bz2 nixpkgs-0452b58f0fac57b50291de9b541e47388ccea7e1.tar.lz nixpkgs-0452b58f0fac57b50291de9b541e47388ccea7e1.tar.xz nixpkgs-0452b58f0fac57b50291de9b541e47388ccea7e1.tar.zst nixpkgs-0452b58f0fac57b50291de9b541e47388ccea7e1.zip | |
gobject-introspection: fix on darwin
Diffstat (limited to 'pkgs/development/libraries/gobject-introspection')
| -rw-r--r-- | pkgs/development/libraries/gobject-introspection/darwin-fixups.patch | 26 | ||||
| -rw-r--r-- | pkgs/development/libraries/gobject-introspection/default.nix | 3 |
2 files changed, 0 insertions, 29 deletions
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 02443d56afa..00000000000 --- 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 55abb21845b..0b48ef076b1 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; { |