qtwebkit-*: fix #25585: bad RPATH entries

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

View file

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

View file

@ -39,5 +39,9 @@ qtSubmodule {
in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ]
++ optionals (!stdenv.isDarwin) [ dlopen-webkit-udev ]
++ 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 ];
}