mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-06 04:27:27 +03:00
qt5.qtModule,qt6.qtModule: deprecate qtInputs
This is just an alias for propagatedBuildInputs. Having two names for the same thing just makes things confusing.
This commit is contained in:
parent
74b1db5164
commit
aae53c8f97
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
|
||||
pname = "qgroundcontrol";
|
||||
version = "4.2.8";
|
||||
|
||||
qtInputs = [
|
||||
propagatedBuildInputs = [
|
||||
qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2
|
||||
qtgraphicaleffects qtspeech qtx11extras
|
||||
];
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
wayland
|
||||
];
|
||||
|
||||
buildInputs = [ SDL2 ] ++ gstInputs ++ qtInputs;
|
||||
buildInputs = [ SDL2 ] ++ gstInputs ++ propagatedBuildInputs;
|
||||
nativeBuildInputs = [ pkg-config qmake qttools wrapQtAppsHook ];
|
||||
|
||||
preConfigure = ''
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qt3d";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative ];
|
||||
outputs = [ "out" "dev" "bin" ];
|
||||
# error: use of undeclared identifier 'stat64'
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dstat64=stat";
|
||||
|
@ -2,6 +2,6 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtcharts";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative ];
|
||||
outputs = [ "out" "dev" "bin" ];
|
||||
}
|
||||
|
@ -2,8 +2,12 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtconnectivity";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
buildInputs = lib.optional stdenv.isLinux bluez;
|
||||
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ IOBluetooth ];
|
||||
propagatedBuildInputs = [
|
||||
qtbase
|
||||
qtdeclarative
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
IOBluetooth
|
||||
];
|
||||
outputs = [ "out" "dev" "bin" ];
|
||||
}
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtdatavis3d";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative ];
|
||||
outputs = [ "out" "dev" "bin" ];
|
||||
# error: use of undeclared identifier 'stat64'
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dstat64=stat";
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtdeclarative";
|
||||
qtInputs = [ qtbase qtsvg ];
|
||||
propagatedBuildInputs = [ qtbase qtsvg ];
|
||||
nativeBuildInputs = [ python3 ];
|
||||
outputs = [ "out" "dev" "bin" ];
|
||||
preConfigure = ''
|
||||
|
@ -2,6 +2,6 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtdoc";
|
||||
qtInputs = [ qtdeclarative ];
|
||||
propagatedBuildInputs = [ qtdeclarative ];
|
||||
outputs = [ "out" ];
|
||||
}
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtgamepad";
|
||||
qtInputs = [ qtbase qtdeclarative ]
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative ]
|
||||
++ lib.optional stdenv.isDarwin GameController;
|
||||
buildInputs = [ ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
@ -2,6 +2,6 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtgraphicaleffects";
|
||||
qtInputs = [ qtdeclarative ];
|
||||
propagatedBuildInputs = [ qtdeclarative ];
|
||||
outputs = [ "out" "dev" ];
|
||||
}
|
||||
|
@ -8,6 +8,5 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtimageformats";
|
||||
qtInputs = [ qtbase ];
|
||||
propagatedBuildInputs = [ libwebp jasper libmng libtiff ];
|
||||
propagatedBuildInputs = [ qtbase libwebp jasper libmng libtiff ];
|
||||
}
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtlocation";
|
||||
qtInputs = [ qtbase qtmultimedia ];
|
||||
propagatedBuildInputs = [ qtbase qtmultimedia ];
|
||||
outputs = [ "bin" "out" "dev" ];
|
||||
qmakeFlags = lib.optionals stdenv.isDarwin [
|
||||
# boost uses std::auto_ptr which has been disabled in clang with libcxx
|
||||
|
@ -5,5 +5,5 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtlottie";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative ];
|
||||
}
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtmacextras";
|
||||
qtInputs = [ qtbase ];
|
||||
propagatedBuildInputs = [ qtbase ];
|
||||
meta = with lib; {
|
||||
maintainers = with maintainers; [ periklis ];
|
||||
platforms = platforms.darwin;
|
||||
|
@ -13,7 +13,7 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtmultimedia";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ gstreamer gst-plugins-base ]
|
||||
# https://github.com/NixOS/nixpkgs/pull/169336 regarding libpulseaudio
|
||||
|
@ -2,5 +2,5 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtnetworkauth";
|
||||
qtInputs = [ qtbase ];
|
||||
propagatedBuildInputs = [ qtbase ];
|
||||
}
|
||||
|
@ -12,7 +12,7 @@ qtModule {
|
||||
"dev"
|
||||
];
|
||||
|
||||
qtInputs = [
|
||||
propagatedBuildInputs = [
|
||||
qtbase
|
||||
qtdeclarative
|
||||
];
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtpositioning";
|
||||
qtInputs = [ qtbase qtdeclarative qtserialport ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative qtserialport ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ];
|
||||
}
|
||||
|
@ -2,5 +2,5 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtquickcontrols";
|
||||
qtInputs = [ qtdeclarative ];
|
||||
propagatedBuildInputs = [ qtdeclarative ];
|
||||
}
|
||||
|
@ -2,6 +2,6 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtquickcontrols2";
|
||||
qtInputs = [ qtdeclarative ];
|
||||
propagatedBuildInputs = [ qtdeclarative ];
|
||||
outputs = [ "out" "dev" "bin" ];
|
||||
}
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtremoteobjects";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative ];
|
||||
# cycle is detected in build when adding "dev" "bin" too
|
||||
outputs = [ "out" ];
|
||||
}
|
||||
|
@ -2,5 +2,5 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtscript";
|
||||
qtInputs = [ qtbase qttools ];
|
||||
propagatedBuildInputs = [ qtbase qttools ];
|
||||
}
|
||||
|
@ -2,6 +2,6 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtscxml";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative ];
|
||||
outputs = [ "out" "dev" "bin" ];
|
||||
}
|
||||
|
@ -2,6 +2,6 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtsensors";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative ];
|
||||
outputs = [ "out" "dev" "bin" ];
|
||||
}
|
||||
|
@ -2,5 +2,5 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtserialbus";
|
||||
qtInputs = [ qtbase qtserialport ];
|
||||
propagatedBuildInputs = [ qtbase qtserialport ];
|
||||
}
|
||||
|
@ -2,6 +2,6 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtserialport";
|
||||
qtInputs = [ qtbase ];
|
||||
propagatedBuildInputs = [ qtbase ];
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isLinux "-DNIXPKGS_LIBUDEV=\"${lib.getLib systemd}/lib/libudev\"";
|
||||
}
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtspeech";
|
||||
qtInputs = [ ];
|
||||
propagatedBuildInputs = [ ];
|
||||
buildInputs = lib.optionals stdenv.isLinux [ speechd ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
outputs = [ "out" "dev" ];
|
||||
|
@ -2,6 +2,6 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtsvg";
|
||||
qtInputs = [ qtbase ];
|
||||
propagatedBuildInputs = [ qtbase ];
|
||||
outputs = [ "out" "dev" "bin" ];
|
||||
}
|
||||
|
@ -20,7 +20,7 @@ qtModule {
|
||||
"bin"
|
||||
];
|
||||
|
||||
qtInputs = [
|
||||
propagatedBuildInputs = [
|
||||
qtbase
|
||||
];
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qttools";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative ];
|
||||
outputs = [ "out" "dev" "bin" ];
|
||||
|
||||
# fixQtBuiltinPaths overwrites a builtin path we should keep
|
||||
|
@ -2,5 +2,5 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtvirtualkeyboard";
|
||||
qtInputs = [ qtbase qtdeclarative qtsvg hunspell ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative qtsvg hunspell ];
|
||||
}
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtwayland";
|
||||
qtInputs = [ qtbase qtquickcontrols ];
|
||||
propagatedBuildInputs = [ qtbase qtquickcontrols ];
|
||||
buildInputs = [ wayland ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
outputs = [ "out" "dev" "bin" ];
|
||||
|
@ -2,7 +2,6 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtwebchannel";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative ];
|
||||
outputs = [ "out" "dev" "bin" ];
|
||||
}
|
||||
|
||||
|
@ -31,7 +31,6 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtwebengine";
|
||||
qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ];
|
||||
nativeBuildInputs = [
|
||||
bison flex git gperf ninja pkg-config python which gn nodejs
|
||||
] ++ lib.optional stdenv.isDarwin xcbuild;
|
||||
@ -127,6 +126,8 @@ qtModule {
|
||||
++ lib.optional enableProprietaryCodecs "-proprietary-codecs";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
qtdeclarative qtquickcontrols qtlocation qtwebchannel
|
||||
|
||||
# Image formats
|
||||
libjpeg libpng libtiff libwebp
|
||||
|
||||
|
@ -2,5 +2,5 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtwebglplugin";
|
||||
qtInputs = [ qtbase qtwebsockets ];
|
||||
propagatedBuildInputs = [ qtbase qtwebsockets ];
|
||||
}
|
||||
|
@ -22,7 +22,7 @@ let
|
||||
in
|
||||
qtModule {
|
||||
pname = "qtwebkit";
|
||||
qtInputs = [ qtbase qtdeclarative qtlocation qtsensors qtwebchannel ]
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative qtlocation qtsensors qtwebchannel ]
|
||||
++ lib.optional stdenv.isDarwin qtmultimedia;
|
||||
buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base hyphen ]
|
||||
++ lib.optionals stdenv.isDarwin [ ICU OpenGL ];
|
||||
|
@ -2,6 +2,6 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtwebsockets";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative ];
|
||||
outputs = [ "out" "dev" "bin" ];
|
||||
}
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtwebview";
|
||||
qtInputs = [ qtdeclarative qtwebengine ];
|
||||
propagatedBuildInputs = [ qtdeclarative qtwebengine ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
CoreFoundation
|
||||
WebKit
|
||||
|
@ -2,5 +2,5 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtx11extras";
|
||||
qtInputs = [ qtbase ];
|
||||
propagatedBuildInputs = [ qtbase ];
|
||||
}
|
||||
|
@ -2,6 +2,6 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtxmlpatterns";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative ];
|
||||
devTools = [ "bin/xmlpatterns" "bin/xmlpatternsvalidator" ];
|
||||
}
|
||||
|
@ -17,7 +17,9 @@ mkDerivation (args // {
|
||||
patches = (args.patches or []) ++ (patches.${pname} or []);
|
||||
|
||||
nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl self.qmake ];
|
||||
propagatedBuildInputs = (args.qtInputs or []) ++ (args.propagatedBuildInputs or []);
|
||||
propagatedBuildInputs =
|
||||
(lib.warnIf (args ? qtInputs) "qt5.qtModule's qtInputs argument is deprecated" args.qtInputs or []) ++
|
||||
(args.propagatedBuildInputs or []);
|
||||
|
||||
outputs = args.outputs or [ "out" "dev" ];
|
||||
setOutputFlags = args.setOutputFlags or false;
|
||||
|
@ -7,6 +7,5 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qt3d";
|
||||
qtInputs = [ qtbase qtdeclarative qtmultimedia ];
|
||||
propagatedBuildInputs = [ assimp ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative qtmultimedia assimp ];
|
||||
}
|
||||
|
@ -8,6 +8,6 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qt5compat";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative ];
|
||||
buildInputs = [ libiconv icu openssl ];
|
||||
}
|
||||
|
@ -5,5 +5,5 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtcharts";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative ];
|
||||
}
|
||||
|
@ -11,8 +11,13 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtconnectivity";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = lib.optionals stdenv.isLinux [ bluez ];
|
||||
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ IOBluetooth PCSC ];
|
||||
propagatedBuildInputs = [
|
||||
qtbase
|
||||
qtdeclarative
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
IOBluetooth
|
||||
PCSC
|
||||
];
|
||||
}
|
||||
|
@ -5,5 +5,5 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtdatavis3d";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative ];
|
||||
}
|
||||
|
@ -8,8 +8,7 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtdeclarative";
|
||||
qtInputs = [ qtbase qtlanguageserver qtshadertools ];
|
||||
propagatedBuildInputs = [ openssl python3 ];
|
||||
propagatedBuildInputs = [ qtbase qtlanguageserver qtshadertools openssl python3 ];
|
||||
patches = [
|
||||
# prevent headaches from stale qmlcache data
|
||||
../patches/qtdeclarative-default-disable-qmlcache.patch
|
||||
|
@ -14,7 +14,7 @@ qtModule {
|
||||
done
|
||||
'';
|
||||
nativeBuildInputs = [ (qttools.override { withClang = true; }) ];
|
||||
qtInputs = [ qtdeclarative ];
|
||||
propagatedBuildInputs = [ qtdeclarative ];
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_MESSAGE_LOG_LEVEL=STATUS"
|
||||
];
|
||||
|
@ -7,6 +7,6 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtgrpc";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative ];
|
||||
buildInputs = [ protobuf grpc ];
|
||||
}
|
||||
|
@ -5,5 +5,5 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qthttpserver";
|
||||
qtInputs = [ qtbase qtwebsockets ];
|
||||
propagatedBuildInputs = [ qtbase qtwebsockets ];
|
||||
}
|
||||
|
@ -8,6 +8,6 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtimageformats";
|
||||
qtInputs = [ qtbase ];
|
||||
propagatedBuildInputs = [ qtbase ];
|
||||
buildInputs = [ libwebp jasper libmng libtiff ];
|
||||
}
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtlanguageserver";
|
||||
qtInputs = [ qtbase ];
|
||||
propagatedBuildInputs = [ qtbase ];
|
||||
|
||||
# Doesn't have version set
|
||||
dontCheckQtModuleVersion = true;
|
||||
|
@ -6,5 +6,5 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtlocation";
|
||||
qtInputs = [ qtbase qtdeclarative qtpositioning ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative qtpositioning ];
|
||||
}
|
||||
|
@ -5,5 +5,5 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtlottie";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative ];
|
||||
}
|
||||
|
@ -12,5 +12,5 @@ qtModule rec {
|
||||
rev = "v${version}";
|
||||
hash = "sha256-yyerVzz+nGT5kjNo24zYqZcJmrE50KCp38s3+samjd0=";
|
||||
};
|
||||
qtInputs = [ qtbase ];
|
||||
propagatedBuildInputs = [ qtbase ];
|
||||
}
|
||||
|
@ -22,12 +22,11 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtmultimedia";
|
||||
qtInputs = [ qtbase qtdeclarative qtsvg qtshadertools ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libunwind orc ]
|
||||
++ lib.optionals stdenv.isLinux [ libpulseaudio elfutils alsa-lib wayland ];
|
||||
propagatedBuildInputs =
|
||||
lib.optionals stdenv.isLinux [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ]
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative qtsvg qtshadertools ]
|
||||
++ lib.optionals stdenv.isLinux [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ]
|
||||
++ lib.optionals stdenv.isDarwin [ VideoToolbox ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin
|
||||
|
@ -2,5 +2,5 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtnetworkauth";
|
||||
qtInputs = [ qtbase ];
|
||||
propagatedBuildInputs = [ qtbase ];
|
||||
}
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtpositioning";
|
||||
qtInputs = [ qtbase qtdeclarative qtserialport ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative qtserialport ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ];
|
||||
}
|
||||
|
@ -6,6 +6,6 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtquick3d";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative ];
|
||||
buildInputs = [ openssl ];
|
||||
}
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtquick3dphysics";
|
||||
qtInputs = [ qtbase qtquick3d ];
|
||||
propagatedBuildInputs = [ qtbase qtquick3d ];
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64)
|
||||
"-faligned-allocation";
|
||||
}
|
||||
|
@ -5,5 +5,5 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtquickeffectmaker";
|
||||
qtInputs = [ qtbase qtquick3d ];
|
||||
propagatedBuildInputs = [ qtbase qtquick3d ];
|
||||
}
|
||||
|
@ -5,5 +5,5 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtquicktimeline";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative ];
|
||||
}
|
||||
|
@ -5,5 +5,5 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtremoteobjects";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative ];
|
||||
}
|
||||
|
@ -2,5 +2,5 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtscxml";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative ];
|
||||
}
|
||||
|
@ -6,5 +6,5 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtsensors";
|
||||
qtInputs = [ qtbase qtdeclarative qtsvg ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative qtsvg ];
|
||||
}
|
||||
|
@ -2,5 +2,5 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtserialbus";
|
||||
qtInputs = [ qtbase qtserialport ];
|
||||
propagatedBuildInputs = [ qtbase qtserialport ];
|
||||
}
|
||||
|
@ -8,7 +8,6 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtserialport";
|
||||
qtInputs = [ qtbase ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
propagatedBuildInputs = lib.optionals stdenv.isLinux [ udev ];
|
||||
propagatedBuildInputs = [ qtbase ] ++ lib.optionals stdenv.isLinux [ udev ];
|
||||
}
|
||||
|
@ -4,5 +4,5 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtshadertools";
|
||||
qtInputs = [ qtbase ];
|
||||
propagatedBuildInputs = [ qtbase ];
|
||||
}
|
||||
|
@ -12,8 +12,8 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtspeech";
|
||||
qtInputs = [ qtbase qtmultimedia ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = lib.optionals stdenv.isLinux [ flite alsa-lib speechd ];
|
||||
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Cocoa ];
|
||||
propagatedBuildInputs = [ qtbase qtmultimedia ]
|
||||
++ lib.optionals stdenv.isDarwin [ Cocoa ];
|
||||
}
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtsvg";
|
||||
qtInputs = [ qtbase ];
|
||||
propagatedBuildInputs = [ qtbase ];
|
||||
buildInputs = [ libwebp jasper libmng zlib ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
}
|
||||
|
@ -15,8 +15,8 @@ qtModule {
|
||||
llvmPackages.libclang
|
||||
llvmPackages.llvm
|
||||
];
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ cups ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative ]
|
||||
++ lib.optionals stdenv.isDarwin [ cups ];
|
||||
patches = [
|
||||
../patches/qttools-paths.patch
|
||||
];
|
||||
|
@ -8,7 +8,6 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtvirtualkeyboard";
|
||||
qtInputs = [ qtbase qtdeclarative qtsvg ];
|
||||
propagatedBuildInputs = [ hunspell ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative qtsvg hunspell ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
}
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtwayland";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative ];
|
||||
buildInputs = [ wayland libdrm ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
}
|
||||
|
@ -7,6 +7,6 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtwebchannel";
|
||||
qtInputs = [ qtbase qtdeclarative qtwebsockets ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative qtwebsockets ];
|
||||
buildInputs = [ openssl ];
|
||||
}
|
||||
|
@ -93,7 +93,6 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtwebengine";
|
||||
qtInputs = [ qtdeclarative qtwebchannel qtwebsockets qtpositioning ];
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
coreutils
|
||||
@ -201,6 +200,11 @@ qtModule {
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
qtdeclarative
|
||||
qtwebchannel
|
||||
qtwebsockets
|
||||
qtpositioning
|
||||
|
||||
# Image formats
|
||||
libjpeg
|
||||
libpng
|
||||
|
@ -6,6 +6,6 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtwebsockets";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative ];
|
||||
buildInputs = [ openssl ];
|
||||
}
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtwebview";
|
||||
qtInputs = [ qtdeclarative ]
|
||||
++ lib.optionals (!stdenv.isDarwin) [ qtwebengine ];
|
||||
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ WebKit ];
|
||||
propagatedBuildInputs = [ qtdeclarative ]
|
||||
++ lib.optionals (!stdenv.isDarwin) [ qtwebengine ]
|
||||
++ lib.optionals stdenv.isDarwin [ WebKit ];
|
||||
}
|
||||
|
@ -22,7 +22,9 @@ stdenv.mkDerivation (args // {
|
||||
buildInputs = args.buildInputs or [ ];
|
||||
nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ cmake ninja perl ]
|
||||
++ lib.optionals stdenv.isDarwin [ moveBuildTree ];
|
||||
propagatedBuildInputs = (args.qtInputs or [ ]) ++ (args.propagatedBuildInputs or [ ]);
|
||||
propagatedBuildInputs =
|
||||
(lib.warnIf (args ? qtInputs) "qt6.qtModule's qtInputs argument is deprecated" args.qtInputs or []) ++
|
||||
(args.propagatedBuildInputs or []);
|
||||
|
||||
moveToDev = false;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user