mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-22 14:45:27 +00:00
gobject-introspection: fix on darwin
This commit is contained in:
parent
f503831956
commit
0452b58f0f
|
@ -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~
|
|
|
@ -40,9 +40,6 @@ stdenv.mkDerivation rec {
|
||||||
patches = stdenv.lib.singleton (substituteAll {
|
patches = stdenv.lib.singleton (substituteAll {
|
||||||
src = ./absolute_shlib_path.patch;
|
src = ./absolute_shlib_path.patch;
|
||||||
inherit nixStoreDir;
|
inherit nixStoreDir;
|
||||||
}) ++ optional stdenv.isDarwin (substituteAll {
|
|
||||||
src = ./darwin-fixups.patch;
|
|
||||||
inherit nixStoreDir;
|
|
||||||
});
|
});
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
|
Loading…
Reference in a new issue