mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-27 05:43:50 +03:00
Merge branch 'qt54'
This commit is contained in:
commit
9f50a1f456
@ -38,6 +38,13 @@ addQtModule() {
|
||||
QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}$1/lib/qt5/qml";
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ -d "$1/share" ]]; then
|
||||
@lndir@/bin/lndir -silent "$1/share" "$qtOut/share"
|
||||
if [[ -n $qtSubmodule ]]; then
|
||||
find "$1/share" -printf 'share/%P\n' >> "$qtOut/nix-support/qt-inputs"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
@ -61,6 +68,7 @@ Prefix = $qtOut
|
||||
Plugins = lib/qt5/plugins
|
||||
Imports = lib/qt5/imports
|
||||
Qml2Imports = lib/qt5/qml
|
||||
Documentation = share/doc/qt5
|
||||
EOF
|
||||
export QMAKE="$qtOut/bin/qmake"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user