BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

qt4: fix patching dlopen paths after multiple outputs

Browse source 
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
(substituteAll {
src = ./dlopen-absolute-paths.diff;
inherit cups icu libXfixes;
glibc = stdenv.cc.libc;
cups = cups.out;
icu = icu.out;
libXfixes = libXfixes.out;
glibc = stdenv.cc.libc.out;
openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path";
})
] ++ stdenv.lib.optional gtkStyle (substituteAll {
src = ./dlopen-gtkstyle.diff;
# substituteAll ignores env vars starting with capital letter
gconf = GConf;
inherit gnome_vfs libgnomeui gtk;
gconf = GConf.out;
gtk = gtk.out;
libgnomeui = libgnomeui.out;
gnome_vfs = gnome_vfs.out;
})
++ stdenv.lib.optional flashplayerFix (substituteAll {
src = ./dlopen-webkit-nsplugin.diff;
inherit gtk gdk_pixbuf;
gtk = gtk.out;
gdk_pixbuf = gdk_pixbuf.out;
})
++ [(fetchpatch {
name = "fix-medium-font.patch";
@ -129,7 +134,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = false;
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
"-lglib-2.0";