diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-24 12:39:37 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-24 12:39:37 +0200 |
| commit | 6e4e7c5dc65a3d988437dc2fa73201b8964c8c60 (patch) | |
| tree | ac550eb4543e2c836f8b298972f26ad9cf093684 /pkgs/development/libraries/qt-4.x/4.8 | |
| parent | 7c62ef8685730fcdfbd544bbc5720bf18f13a5fd (diff) | |
| parent | c6f7545209676dfa6aef29c2a9c3687b6742e183 (diff) | |
| download | nixpkgs-6e4e7c5dc65a3d988437dc2fa73201b8964c8c60.tar nixpkgs-6e4e7c5dc65a3d988437dc2fa73201b8964c8c60.tar.gz nixpkgs-6e4e7c5dc65a3d988437dc2fa73201b8964c8c60.tar.bz2 nixpkgs-6e4e7c5dc65a3d988437dc2fa73201b8964c8c60.tar.lz nixpkgs-6e4e7c5dc65a3d988437dc2fa73201b8964c8c60.tar.xz nixpkgs-6e4e7c5dc65a3d988437dc2fa73201b8964c8c60.tar.zst nixpkgs-6e4e7c5dc65a3d988437dc2fa73201b8964c8c60.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/qt-4.x/4.8')
| -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; |