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

Merge pull request #60420 from dtzWill/fix/qtwebkit-libgdk-from-gtk-apparently

Browse Source 
qtwebkit: fix path for libgdk-x11-2.0, it's in gtk2 apparently
This commit is contained in:
worldofpeace 2019-05-19 00:28:11 -04:00 committed by GitHub
commit bcc56cbce6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,7 +100,6 @@ stdenv.mkDerivation rec {
++ lib.optional flashplayerFix (substituteAll { ++ lib.optional flashplayerFix (substituteAll {
src = ./dlopen-webkit-nsplugin.diff; src = ./dlopen-webkit-nsplugin.diff;
gtk = gtk2.out; gtk = gtk2.out;
gdk_pixbuf = gdk_pixbuf.out;
}) })
++ lib.optional stdenv.isAarch64 (fetchpatch { ++ lib.optional stdenv.isAarch64 (fetchpatch {
url = "https://src.fedoraproject.org/rpms/qt/raw/ecf530486e0fb7fe31bad26805cde61115562b2b/f/qt-aarch64.patch"; url = "https://src.fedoraproject.org/rpms/qt/raw/ecf530486e0fb7fe31bad26805cde61115562b2b/f/qt-aarch64.patch";

4
pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff
View File

@ -20,7 +20,7 @@ index 2fe69d1..b658e4a 100644
// The code below has the same effect as this one: // The code below has the same effect as this one:
// Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); - QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
+ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0); + QLibrary library(QLatin1String("@gtk@/lib/libgdk-x11-2.0"), 0);
if (!library.load()) if (!library.load())
return 0; return 0;
@ -46,7 +46,7 @@ index b8c8f2a..e7f4dc5 100644
// Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); - QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
+ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0); + QLibrary library(QLatin1String("@gtk@/lib/libgdk-x11-2.0"), 0);
if (!library.load()) if (!library.load())
return 0; return 0;

3
pkgs/development/libraries/qt-5/modules/qtwebkit.nix
View File

@ -58,7 +58,8 @@ qtModule {
++ optionals flashplayerFix ++ optionals flashplayerFix
[ [
''-DNIXPKGS_LIBGTK2="${getLib gtk2}/lib/libgtk-x11-2.0"'' ''-DNIXPKGS_LIBGTK2="${getLib gtk2}/lib/libgtk-x11-2.0"''
''-DNIXPKGS_LIBGDK2="${getLib gdk_pixbuf}/lib/libgdk-x11-2.0"'' # this file used to exist in gdk_pixbuf?
''-DNIXPKGS_LIBGDK2="${getLib gtk2}/lib/libgdk-x11-2.0"''
] ]
++ optional (!stdenv.isDarwin) ''-DNIXPKGS_LIBUDEV="${getLib systemd}/lib/libudev"''; ++ optional (!stdenv.isDarwin) ''-DNIXPKGS_LIBUDEV="${getLib systemd}/lib/libudev"'';