mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 23:43:30 +00:00
fix-qmake-libtool.sh
This commit is contained in:
parent
dd599e20cf
commit
756b46a449
@ -160,9 +160,7 @@ let
|
|||||||
qmake = makeSetupHook {
|
qmake = makeSetupHook {
|
||||||
deps = [ self.qtbase.dev ];
|
deps = [ self.qtbase.dev ];
|
||||||
substitutions = {
|
substitutions = {
|
||||||
inherit (stdenv) isDarwin;
|
fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh;
|
||||||
qtbase_dev = self.qtbase.dev;
|
|
||||||
fix_qt_builtin_paths = ../hooks/fix-qt-builtin-paths.sh;
|
|
||||||
};
|
};
|
||||||
} ../hooks/qmake-hook.sh;
|
} ../hooks/qmake-hook.sh;
|
||||||
|
|
||||||
|
@ -154,9 +154,7 @@ let
|
|||||||
qmake = makeSetupHook {
|
qmake = makeSetupHook {
|
||||||
deps = [ self.qtbase.dev ];
|
deps = [ self.qtbase.dev ];
|
||||||
substitutions = {
|
substitutions = {
|
||||||
inherit (stdenv) isDarwin;
|
fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh;
|
||||||
qtbase_dev = self.qtbase.dev;
|
|
||||||
fix_qt_builtin_paths = ../hooks/fix-qt-builtin-paths.sh;
|
|
||||||
};
|
};
|
||||||
} ../hooks/qmake-hook.sh;
|
} ../hooks/qmake-hook.sh;
|
||||||
|
|
||||||
|
14
pkgs/development/libraries/qt-5/hooks/fix-qmake-libtool.sh
Normal file
14
pkgs/development/libraries/qt-5/hooks/fix-qmake-libtool.sh
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
# Fix libtool libraries generated by qmake.
|
||||||
|
# qmake started inserting filenames of shared objects instead of the appropriate
|
||||||
|
# linker flags. fixQmakeLibtool searches for broken libtool libraries and
|
||||||
|
# replaces the filenames with the linker flags that should have been there.
|
||||||
|
fixQmakeLibtool() {
|
||||||
|
if [ -d "$1" ]; then
|
||||||
|
find "$1" -name '*.la' | while read la; do
|
||||||
|
sed -i "$la" \
|
||||||
|
-e '/^dependency_libs/ s,\(/[^ ]\+\)/lib\([^/ ]\+\)\.so,-L\1 -l\2,g'
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
fixupOutputHooks+=('fixQmakeLibtool $prefix')
|
@ -1,3 +1,5 @@
|
|||||||
|
. @fix_qmake_libtool@
|
||||||
|
|
||||||
qmakeFlags=( $qmakeFlags )
|
qmakeFlags=( $qmakeFlags )
|
||||||
|
|
||||||
qmakePrePhase() {
|
qmakePrePhase() {
|
||||||
|
@ -100,6 +100,7 @@ stdenv.mkDerivation {
|
|||||||
. "$fix_qt_builtin_paths"
|
. "$fix_qt_builtin_paths"
|
||||||
. "$fix_qt_module_paths"
|
. "$fix_qt_module_paths"
|
||||||
. ${../hooks/move-qt-dev-tools.sh}
|
. ${../hooks/move-qt-dev-tools.sh}
|
||||||
|
. ${../hooks/fix-qmake-libtool.sh}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postPatch =
|
postPatch =
|
||||||
|
Loading…
Reference in New Issue
Block a user