diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-05-19 00:28:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-19 00:28:11 -0400 |
| commit | bcc56cbce65f05af1ff4209bf8ea46ab70dd26f8 (patch) | |
| tree | 52fb29ef5661789a39993fa593c2238d81d91d2c /pkgs/development/libraries/qt-4.x | |
| parent | e22d6ec407e67f8c71c49ff55c806c84524a36f1 (diff) | |
| parent | 41e9920fcbe592310b2949ff28ebf689a0c74286 (diff) | |
| download | nixpkgs-bcc56cbce65f05af1ff4209bf8ea46ab70dd26f8.tar nixpkgs-bcc56cbce65f05af1ff4209bf8ea46ab70dd26f8.tar.gz nixpkgs-bcc56cbce65f05af1ff4209bf8ea46ab70dd26f8.tar.bz2 nixpkgs-bcc56cbce65f05af1ff4209bf8ea46ab70dd26f8.tar.lz nixpkgs-bcc56cbce65f05af1ff4209bf8ea46ab70dd26f8.tar.xz nixpkgs-bcc56cbce65f05af1ff4209bf8ea46ab70dd26f8.tar.zst nixpkgs-bcc56cbce65f05af1ff4209bf8ea46ab70dd26f8.zip | |
Merge pull request #60420 from dtzWill/fix/qtwebkit-libgdk-from-gtk-apparently
qtwebkit: fix path for libgdk-x11-2.0, it's in gtk2 apparently
Diffstat (limited to 'pkgs/development/libraries/qt-4.x')
| -rw-r--r-- | pkgs/development/libraries/qt-4.x/4.8/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index de9a656f6ff..d5bd065ab64 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -100,7 +100,6 @@ stdenv.mkDerivation rec { ++ lib.optional flashplayerFix (substituteAll { src = ./dlopen-webkit-nsplugin.diff; gtk = gtk2.out; - gdk_pixbuf = gdk_pixbuf.out; }) ++ lib.optional stdenv.isAarch64 (fetchpatch { url = "https://src.fedoraproject.org/rpms/qt/raw/ecf530486e0fb7fe31bad26805cde61115562b2b/f/qt-aarch64.patch"; diff --git a/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff b/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff index 14199d40503..d2ebbf3b45a 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff +++ b/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff @@ -20,7 +20,7 @@ index 2fe69d1..b658e4a 100644 // The code below has the same effect as this one: // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); - 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()) return 0; @@ -46,7 +46,7 @@ index b8c8f2a..e7f4dc5 100644 // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); - 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()) return 0; |