qt5: 5.12.7 -> 5.14.2
This includes contributions by @ttuegel and @DizFer. Thanks!
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
{ qtModule, stdenv, qtbase, qtdeclarative, pkgconfig
|
||||
, alsaLib, gstreamer, gst-plugins-base, libpulseaudio
|
||||
, alsaLib, gstreamer, gst-plugins-base, libpulseaudio, wayland
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
@@ -8,8 +8,9 @@ qtModule {
|
||||
name = "qtmultimedia";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ gstreamer gst-plugins-base libpulseaudio]
|
||||
++ optional (stdenv.isLinux) alsaLib;
|
||||
buildInputs = [ gstreamer gst-plugins-base libpulseaudio ]
|
||||
++ optional (stdenv.isLinux) alsaLib
|
||||
++ optional (versionAtLeast qtbase.version "5.14.0" && stdenv.isLinux) wayland;
|
||||
outputs = [ "bin" "dev" "out" ];
|
||||
qmakeFlags = [ "GST_VERSION=1.0" ];
|
||||
NIX_LDFLAGS = optionalString (stdenv.isDarwin) "-lobjc";
|
||||
|
||||
@@ -11,6 +11,8 @@ qtModule {
|
||||
postPatch = ''
|
||||
sed -i "src/linguist/linguist.pro" \
|
||||
-e '/^cmake_linguist_config_version_file.input =/ s|$$\[QT_HOST_DATA.*\]|${getDev qtbase}|'
|
||||
sed -i "src/qtattributionsscanner/qtattributionsscanner.pro" \
|
||||
-e '/^cmake_qattributionsscanner_config_version_file.input =/ s|$$\[QT_HOST_DATA.*\]|${getDev qtbase}|'
|
||||
'';
|
||||
|
||||
devTools = [
|
||||
@@ -20,14 +22,18 @@ qtModule {
|
||||
"bin/qdoc"
|
||||
"bin/lconvert"
|
||||
"bin/designer"
|
||||
"bin/qtattributesscanner"
|
||||
"bin/qtattributionsscanner"
|
||||
"bin/lrelease"
|
||||
"bin/lrelease-pro"
|
||||
"bin/pixeltool"
|
||||
"bin/lupdate"
|
||||
"bin/lupdate-pro"
|
||||
"bin/qtdiag"
|
||||
"bin/qhelpgenerator"
|
||||
"bin/qtplugininfo"
|
||||
"bin/qthelpconverter"
|
||||
"bin/lprodump"
|
||||
"bin/qdistancefieldgenerator"
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
"bin/macdeployqt"
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user