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

qtwebkit-*: fix #25585: bad RPATH entries

Browse Source
This commit is contained in:
Vladimír Čunát 2017-05-16 18:11:07 +02:00
parent 65ede052fa
commit f5c568446a
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix
View File

@ -31,5 +31,9 @@ qtSubmodule {
}; };
in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ] in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ]
++ [ dlopen-webkit-udev ]; ++ [ dlopen-webkit-udev ];
# Hack to avoid TMPDIR in RPATHs.
preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" '';
meta.maintainers = with stdenv.lib.maintainers; [ abbradar ]; meta.maintainers = with stdenv.lib.maintainers; [ abbradar ];
} }

4
pkgs/development/libraries/qt-5/5.8/qtwebkit/default.nix
View File

@ -39,5 +39,9 @@ qtSubmodule {
in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ] in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ]
++ optionals (!stdenv.isDarwin) [ dlopen-webkit-udev ] ++ optionals (!stdenv.isDarwin) [ dlopen-webkit-udev ]
++ optionals (stdenv.isDarwin) [ ./0004-icucore-darwin.patch ]; ++ optionals (stdenv.isDarwin) [ ./0004-icucore-darwin.patch ];
# Hack to avoid TMPDIR in RPATHs.
preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" '';
meta.maintainers = with stdenv.lib.maintainers; [ abbradar periklis ]; meta.maintainers = with stdenv.lib.maintainers; [ abbradar periklis ];
} }