MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 15:22:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #15057 from vbgl/gobject-introspection-on-dawin

Browse source 
gobject-introspection: fix on darwin
This commit is contained in:
Joachim Fasting 2016-05-02 03:52:54 +02:00
commit 3e750abb0c
2 changed files with 0 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pkgs/development/libraries/gobject-introspection/darwin-fixups.patch
View file

@ -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~

3
pkgs/development/libraries/gobject-introspection/default.nix
View file

@ -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; {