public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qt4: fix patching dlopen paths after multiple outputs 

Also another leftover fix.
This commit is contained in:
Vladimír Čunát 2015-10-11 18:00:04 +02:00
parent 194f0e880f
commit 2e2d39f31a
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/libraries/qt-4.x/4.8/default.nix
View File

@ -52,19 +52,24 @@ stdenv.mkDerivation rec {
[ ./glib-2.32.patch [ ./glib-2.32.patch
(substituteAll { (substituteAll {
src = ./dlopen-absolute-paths.diff; src = ./dlopen-absolute-paths.diff;
inherit cups icu libXfixes; cups = cups.out;
glibc = stdenv.cc.libc; icu = icu.out;
libXfixes = libXfixes.out;
glibc = stdenv.cc.libc.out;
openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path"; openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path";
}) })
] ++ stdenv.lib.optional gtkStyle (substituteAll { ] ++ stdenv.lib.optional gtkStyle (substituteAll {
src = ./dlopen-gtkstyle.diff; src = ./dlopen-gtkstyle.diff;
# substituteAll ignores env vars starting with capital letter # substituteAll ignores env vars starting with capital letter
gconf = GConf; gconf = GConf.out;
inherit gnome_vfs libgnomeui gtk; gtk = gtk.out;
libgnomeui = libgnomeui.out;
gnome_vfs = gnome_vfs.out;
}) })
++ stdenv.lib.optional flashplayerFix (substituteAll { ++ stdenv.lib.optional flashplayerFix (substituteAll {
src = ./dlopen-webkit-nsplugin.diff; src = ./dlopen-webkit-nsplugin.diff;
inherit gtk gdk_pixbuf; gtk = gtk.out;
gdk_pixbuf = gdk_pixbuf.out;
}) })
++ [(fetchpatch { ++ [(fetchpatch {
name = "fix-medium-font.patch"; name = "fix-medium-font.patch";
@ -129,7 +134,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = false; enableParallelBuilding = false;
NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin
"-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include"; "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
NIX_LDFLAGS = optionalString stdenv.isDarwin NIX_LDFLAGS = optionalString stdenv.isDarwin
"-lglib-2.0"; "-lglib-2.0";