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-5/modules | |
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-5/modules')
-rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtwebkit.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 6b43f6ed25c..2a474ab0ffe 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -58,7 +58,8 @@ qtModule { ++ optionals flashplayerFix [ ''-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"''; |