Merge pull request #255507 from alyssais/qtInputs

qt5.qtModule,qt6.qtModule: deprecate qtInputs

Nick Cao 18316a73 b12f7d7b

+2 -2
pkgs/applications/science/robotics/qgroundcontrol/default.nix
···
pname = "qgroundcontrol";
version = "4.2.8";
-
qtInputs = [
+
propagatedBuildInputs = [
qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2
qtgraphicaleffects qtspeech qtx11extras
];
···
wayland
];
-
buildInputs = [ SDL2 ] ++ gstInputs ++ qtInputs;
+
buildInputs = [ SDL2 ] ++ gstInputs ++ propagatedBuildInputs;
nativeBuildInputs = [ pkg-config qmake qttools wrapQtAppsHook ];
preConfigure = ''
+1 -1
pkgs/development/libraries/qt-5/modules/qt3d.nix
···
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";
+1 -1
pkgs/development/libraries/qt-5/modules/qtcharts.nix
···
qtModule {
pname = "qtcharts";
-
qtInputs = [ qtbase qtdeclarative ];
+
propagatedBuildInputs = [ qtbase qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
}
+6 -2
pkgs/development/libraries/qt-5/modules/qtconnectivity.nix
···
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" ];
}
+1 -1
pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix
···
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";
+1 -1
pkgs/development/libraries/qt-5/modules/qtdeclarative.nix
···
qtModule {
pname = "qtdeclarative";
-
qtInputs = [ qtbase qtsvg ];
+
propagatedBuildInputs = [ qtbase qtsvg ];
nativeBuildInputs = [ python3 ];
outputs = [ "out" "dev" "bin" ];
preConfigure = ''
+1 -1
pkgs/development/libraries/qt-5/modules/qtdoc.nix
···
qtModule {
pname = "qtdoc";
-
qtInputs = [ qtdeclarative ];
+
propagatedBuildInputs = [ qtdeclarative ];
outputs = [ "out" ];
}
+1 -1
pkgs/development/libraries/qt-5/modules/qtgamepad.nix
···
qtModule {
pname = "qtgamepad";
-
qtInputs = [ qtbase qtdeclarative ]
+
propagatedBuildInputs = [ qtbase qtdeclarative ]
++ lib.optional stdenv.isDarwin GameController;
buildInputs = [ ];
nativeBuildInputs = [ pkg-config ];
+1 -1
pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix
···
qtModule {
pname = "qtgraphicaleffects";
-
qtInputs = [ qtdeclarative ];
+
propagatedBuildInputs = [ qtdeclarative ];
outputs = [ "out" "dev" ];
}
+1 -2
pkgs/development/libraries/qt-5/modules/qtimageformats.nix
···
qtModule {
pname = "qtimageformats";
-
qtInputs = [ qtbase ];
-
propagatedBuildInputs = [ libwebp jasper libmng libtiff ];
+
propagatedBuildInputs = [ qtbase libwebp jasper libmng libtiff ];
}
+1 -1
pkgs/development/libraries/qt-5/modules/qtlocation.nix
···
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
+1 -1
pkgs/development/libraries/qt-5/modules/qtlottie.nix
···
qtModule {
pname = "qtlottie";
-
qtInputs = [ qtbase qtdeclarative ];
+
propagatedBuildInputs = [ qtbase qtdeclarative ];
}
+1 -1
pkgs/development/libraries/qt-5/modules/qtmacextras.nix
···
qtModule {
pname = "qtmacextras";
-
qtInputs = [ qtbase ];
+
propagatedBuildInputs = [ qtbase ];
meta = with lib; {
maintainers = with maintainers; [ periklis ];
platforms = platforms.darwin;
+1 -1
pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
···
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
+1 -1
pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix
···
qtModule {
pname = "qtnetworkauth";
-
qtInputs = [ qtbase ];
+
propagatedBuildInputs = [ qtbase ];
}
+1 -1
pkgs/development/libraries/qt-5/modules/qtpim.nix
···
"dev"
];
-
qtInputs = [
+
propagatedBuildInputs = [
qtbase
qtdeclarative
];
+1 -1
pkgs/development/libraries/qt-5/modules/qtpositioning.nix
···
qtModule {
pname = "qtpositioning";
-
qtInputs = [ qtbase qtdeclarative qtserialport ];
+
propagatedBuildInputs = [ qtbase qtdeclarative qtserialport ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
}
+1 -1
pkgs/development/libraries/qt-5/modules/qtquickcontrols.nix
···
qtModule {
pname = "qtquickcontrols";
-
qtInputs = [ qtdeclarative ];
+
propagatedBuildInputs = [ qtdeclarative ];
}
+1 -1
pkgs/development/libraries/qt-5/modules/qtquickcontrols2.nix
···
qtModule {
pname = "qtquickcontrols2";
-
qtInputs = [ qtdeclarative ];
+
propagatedBuildInputs = [ qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
}
+1 -1
pkgs/development/libraries/qt-5/modules/qtremoteobjects.nix
···
qtModule {
pname = "qtremoteobjects";
-
qtInputs = [ qtbase qtdeclarative ];
+
propagatedBuildInputs = [ qtbase qtdeclarative ];
# cycle is detected in build when adding "dev" "bin" too
outputs = [ "out" ];
}
+1 -1
pkgs/development/libraries/qt-5/modules/qtscript.nix
···
qtModule {
pname = "qtscript";
-
qtInputs = [ qtbase qttools ];
+
propagatedBuildInputs = [ qtbase qttools ];
}
+1 -1
pkgs/development/libraries/qt-5/modules/qtscxml.nix
···
qtModule {
pname = "qtscxml";
-
qtInputs = [ qtbase qtdeclarative ];
+
propagatedBuildInputs = [ qtbase qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
}
+1 -1
pkgs/development/libraries/qt-5/modules/qtsensors.nix
···
qtModule {
pname = "qtsensors";
-
qtInputs = [ qtbase qtdeclarative ];
+
propagatedBuildInputs = [ qtbase qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
}
+1 -1
pkgs/development/libraries/qt-5/modules/qtserialbus.nix
···
qtModule {
pname = "qtserialbus";
-
qtInputs = [ qtbase qtserialport ];
+
propagatedBuildInputs = [ qtbase qtserialport ];
}
+1 -1
pkgs/development/libraries/qt-5/modules/qtserialport.nix
···
qtModule {
pname = "qtserialport";
-
qtInputs = [ qtbase ];
+
propagatedBuildInputs = [ qtbase ];
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isLinux "-DNIXPKGS_LIBUDEV=\"${lib.getLib systemd}/lib/libudev\"";
}
+1 -1
pkgs/development/libraries/qt-5/modules/qtspeech.nix
···
qtModule {
pname = "qtspeech";
-
qtInputs = [ ];
+
propagatedBuildInputs = [ ];
buildInputs = lib.optionals stdenv.isLinux [ speechd ];
nativeBuildInputs = [ pkg-config ];
outputs = [ "out" "dev" ];
+1 -1
pkgs/development/libraries/qt-5/modules/qtsvg.nix
···
qtModule {
pname = "qtsvg";
-
qtInputs = [ qtbase ];
+
propagatedBuildInputs = [ qtbase ];
outputs = [ "out" "dev" "bin" ];
}
+1 -1
pkgs/development/libraries/qt-5/modules/qtsystems.nix
···
"bin"
];
-
qtInputs = [
+
propagatedBuildInputs = [
qtbase
];
+1 -1
pkgs/development/libraries/qt-5/modules/qttools.nix
···
qtModule {
pname = "qttools";
-
qtInputs = [ qtbase qtdeclarative ];
+
propagatedBuildInputs = [ qtbase qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
# fixQtBuiltinPaths overwrites a builtin path we should keep
+1 -1
pkgs/development/libraries/qt-5/modules/qtvirtualkeyboard.nix
···
qtModule {
pname = "qtvirtualkeyboard";
-
qtInputs = [ qtbase qtdeclarative qtsvg hunspell ];
+
propagatedBuildInputs = [ qtbase qtdeclarative qtsvg hunspell ];
}
+1 -1
pkgs/development/libraries/qt-5/modules/qtwayland.nix
···
qtModule {
pname = "qtwayland";
-
qtInputs = [ qtbase qtquickcontrols ];
+
propagatedBuildInputs = [ qtbase qtquickcontrols ];
buildInputs = [ wayland ];
nativeBuildInputs = [ pkg-config wayland-scanner ];
outputs = [ "out" "dev" "bin" ];
+1 -2
pkgs/development/libraries/qt-5/modules/qtwebchannel.nix
···
qtModule {
pname = "qtwebchannel";
-
qtInputs = [ qtbase qtdeclarative ];
+
propagatedBuildInputs = [ qtbase qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
}
-
+2 -1
pkgs/development/libraries/qt-5/modules/qtwebengine.nix
···
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;
···
++ lib.optional enableProprietaryCodecs "-proprietary-codecs";
propagatedBuildInputs = [
+
qtdeclarative qtquickcontrols qtlocation qtwebchannel
+
# Image formats
libjpeg libpng libtiff libwebp
+1 -1
pkgs/development/libraries/qt-5/modules/qtwebglplugin.nix
···
qtModule {
pname = "qtwebglplugin";
-
qtInputs = [ qtbase qtwebsockets ];
+
propagatedBuildInputs = [ qtbase qtwebsockets ];
}
+1 -1
pkgs/development/libraries/qt-5/modules/qtwebkit.nix
···
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 ];
+1 -1
pkgs/development/libraries/qt-5/modules/qtwebsockets.nix
···
qtModule {
pname = "qtwebsockets";
-
qtInputs = [ qtbase qtdeclarative ];
+
propagatedBuildInputs = [ qtbase qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
}
+1 -1
pkgs/development/libraries/qt-5/modules/qtwebview.nix
···
qtModule {
pname = "qtwebview";
-
qtInputs = [ qtdeclarative qtwebengine ];
+
propagatedBuildInputs = [ qtdeclarative qtwebengine ];
buildInputs = lib.optionals stdenv.isDarwin [
CoreFoundation
WebKit
+1 -1
pkgs/development/libraries/qt-5/modules/qtx11extras.nix
···
qtModule {
pname = "qtx11extras";
-
qtInputs = [ qtbase ];
+
propagatedBuildInputs = [ qtbase ];
}
+1 -1
pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix
···
qtModule {
pname = "qtxmlpatterns";
-
qtInputs = [ qtbase qtdeclarative ];
+
propagatedBuildInputs = [ qtbase qtdeclarative ];
devTools = [ "bin/xmlpatterns" "bin/xmlpatternsvalidator" ];
}
+3 -1
pkgs/development/libraries/qt-5/qtModule.nix
···
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;
+1 -2
pkgs/development/libraries/qt-6/modules/qt3d.nix
···
qtModule {
pname = "qt3d";
-
qtInputs = [ qtbase qtdeclarative qtmultimedia ];
-
propagatedBuildInputs = [ assimp ];
+
propagatedBuildInputs = [ qtbase qtdeclarative qtmultimedia assimp ];
}
+1 -1
pkgs/development/libraries/qt-6/modules/qt5compat.nix
···
qtModule {
pname = "qt5compat";
-
qtInputs = [ qtbase qtdeclarative ];
+
propagatedBuildInputs = [ qtbase qtdeclarative ];
buildInputs = [ libiconv icu openssl ];
}
+1 -1
pkgs/development/libraries/qt-6/modules/qtcharts.nix
···
qtModule {
pname = "qtcharts";
-
qtInputs = [ qtbase qtdeclarative ];
+
propagatedBuildInputs = [ qtbase qtdeclarative ];
}
+7 -2
pkgs/development/libraries/qt-6/modules/qtconnectivity.nix
···
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
+
];
}
+1 -1
pkgs/development/libraries/qt-6/modules/qtdatavis3d.nix
···
qtModule {
pname = "qtdatavis3d";
-
qtInputs = [ qtbase qtdeclarative ];
+
propagatedBuildInputs = [ qtbase qtdeclarative ];
}
+1 -2
pkgs/development/libraries/qt-6/modules/qtdeclarative.nix
···
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
+1 -1
pkgs/development/libraries/qt-6/modules/qtdoc.nix
···
done
'';
nativeBuildInputs = [ (qttools.override { withClang = true; }) ];
-
qtInputs = [ qtdeclarative ];
+
propagatedBuildInputs = [ qtdeclarative ];
cmakeFlags = [
"-DCMAKE_MESSAGE_LOG_LEVEL=STATUS"
];
+1 -1
pkgs/development/libraries/qt-6/modules/qtgrpc.nix
···
qtModule {
pname = "qtgrpc";
-
qtInputs = [ qtbase qtdeclarative ];
+
propagatedBuildInputs = [ qtbase qtdeclarative ];
buildInputs = [ protobuf grpc ];
}
+1 -1
pkgs/development/libraries/qt-6/modules/qthttpserver.nix
···
qtModule {
pname = "qthttpserver";
-
qtInputs = [ qtbase qtwebsockets ];
+
propagatedBuildInputs = [ qtbase qtwebsockets ];
}
+1 -1
pkgs/development/libraries/qt-6/modules/qtimageformats.nix
···
qtModule {
pname = "qtimageformats";
-
qtInputs = [ qtbase ];
+
propagatedBuildInputs = [ qtbase ];
buildInputs = [ libwebp jasper libmng libtiff ];
}
+1 -1
pkgs/development/libraries/qt-6/modules/qtlanguageserver.nix
···
qtModule {
pname = "qtlanguageserver";
-
qtInputs = [ qtbase ];
+
propagatedBuildInputs = [ qtbase ];
# Doesn't have version set
dontCheckQtModuleVersion = true;
+1 -1
pkgs/development/libraries/qt-6/modules/qtlocation.nix
···
qtModule {
pname = "qtlocation";
-
qtInputs = [ qtbase qtdeclarative qtpositioning ];
+
propagatedBuildInputs = [ qtbase qtdeclarative qtpositioning ];
}
+1 -1
pkgs/development/libraries/qt-6/modules/qtlottie.nix
···
qtModule {
pname = "qtlottie";
-
qtInputs = [ qtbase qtdeclarative ];
+
propagatedBuildInputs = [ qtbase qtdeclarative ];
}
+1 -1
pkgs/development/libraries/qt-6/modules/qtmqtt.nix
···
rev = "v${version}";
hash = "sha256-yyerVzz+nGT5kjNo24zYqZcJmrE50KCp38s3+samjd0=";
};
-
qtInputs = [ qtbase ];
+
propagatedBuildInputs = [ qtbase ];
}
+2 -3
pkgs/development/libraries/qt-6/modules/qtmultimedia.nix
···
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
+1 -1
pkgs/development/libraries/qt-6/modules/qtnetworkauth.nix
···
qtModule {
pname = "qtnetworkauth";
-
qtInputs = [ qtbase ];
+
propagatedBuildInputs = [ qtbase ];
}
+1 -1
pkgs/development/libraries/qt-6/modules/qtpositioning.nix
···
qtModule {
pname = "qtpositioning";
-
qtInputs = [ qtbase qtdeclarative qtserialport ];
+
propagatedBuildInputs = [ qtbase qtdeclarative qtserialport ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
}
+1 -1
pkgs/development/libraries/qt-6/modules/qtquick3d.nix
···
qtModule {
pname = "qtquick3d";
-
qtInputs = [ qtbase qtdeclarative ];
+
propagatedBuildInputs = [ qtbase qtdeclarative ];
buildInputs = [ openssl ];
}
+1 -1
pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix
···
qtModule {
pname = "qtquick3dphysics";
-
qtInputs = [ qtbase qtquick3d ];
+
propagatedBuildInputs = [ qtbase qtquick3d ];
env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64)
"-faligned-allocation";
}
+1 -1
pkgs/development/libraries/qt-6/modules/qtquickeffectmaker.nix
···
qtModule {
pname = "qtquickeffectmaker";
-
qtInputs = [ qtbase qtquick3d ];
+
propagatedBuildInputs = [ qtbase qtquick3d ];
}
+1 -1
pkgs/development/libraries/qt-6/modules/qtquicktimeline.nix
···
qtModule {
pname = "qtquicktimeline";
-
qtInputs = [ qtbase qtdeclarative ];
+
propagatedBuildInputs = [ qtbase qtdeclarative ];
}
+1 -1
pkgs/development/libraries/qt-6/modules/qtremoteobjects.nix
···
qtModule {
pname = "qtremoteobjects";
-
qtInputs = [ qtbase qtdeclarative ];
+
propagatedBuildInputs = [ qtbase qtdeclarative ];
}
+1 -1
pkgs/development/libraries/qt-6/modules/qtscxml.nix
···
qtModule {
pname = "qtscxml";
-
qtInputs = [ qtbase qtdeclarative ];
+
propagatedBuildInputs = [ qtbase qtdeclarative ];
}
+1 -1
pkgs/development/libraries/qt-6/modules/qtsensors.nix
···
qtModule {
pname = "qtsensors";
-
qtInputs = [ qtbase qtdeclarative qtsvg ];
+
propagatedBuildInputs = [ qtbase qtdeclarative qtsvg ];
}
+1 -1
pkgs/development/libraries/qt-6/modules/qtserialbus.nix
···
qtModule {
pname = "qtserialbus";
-
qtInputs = [ qtbase qtserialport ];
+
propagatedBuildInputs = [ qtbase qtserialport ];
}
+1 -2
pkgs/development/libraries/qt-6/modules/qtserialport.nix
···
qtModule {
pname = "qtserialport";
-
qtInputs = [ qtbase ];
nativeBuildInputs = [ pkg-config ];
-
propagatedBuildInputs = lib.optionals stdenv.isLinux [ udev ];
+
propagatedBuildInputs = [ qtbase ] ++ lib.optionals stdenv.isLinux [ udev ];
}
+1 -1
pkgs/development/libraries/qt-6/modules/qtshadertools.nix
···
qtModule {
pname = "qtshadertools";
-
qtInputs = [ qtbase ];
+
propagatedBuildInputs = [ qtbase ];
}
+2 -2
pkgs/development/libraries/qt-6/modules/qtspeech.nix
···
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 ];
}
+1 -1
pkgs/development/libraries/qt-6/modules/qtsvg.nix
···
qtModule {
pname = "qtsvg";
-
qtInputs = [ qtbase ];
+
propagatedBuildInputs = [ qtbase ];
buildInputs = [ libwebp jasper libmng zlib ];
nativeBuildInputs = [ pkg-config ];
}
+2 -2
pkgs/development/libraries/qt-6/modules/qttools.nix
···
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
];
+1 -2
pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix
···
qtModule {
pname = "qtvirtualkeyboard";
-
qtInputs = [ qtbase qtdeclarative qtsvg ];
-
propagatedBuildInputs = [ hunspell ];
+
propagatedBuildInputs = [ qtbase qtdeclarative qtsvg hunspell ];
nativeBuildInputs = [ pkg-config ];
}
+1 -1
pkgs/development/libraries/qt-6/modules/qtwayland.nix
···
qtModule {
pname = "qtwayland";
-
qtInputs = [ qtbase qtdeclarative ];
+
propagatedBuildInputs = [ qtbase qtdeclarative ];
buildInputs = [ wayland libdrm ];
nativeBuildInputs = [ pkg-config ];
}
+1 -1
pkgs/development/libraries/qt-6/modules/qtwebchannel.nix
···
qtModule {
pname = "qtwebchannel";
-
qtInputs = [ qtbase qtdeclarative qtwebsockets ];
+
propagatedBuildInputs = [ qtbase qtdeclarative qtwebsockets ];
buildInputs = [ openssl ];
}
+5 -1
pkgs/development/libraries/qt-6/modules/qtwebengine.nix
···
qtModule {
pname = "qtwebengine";
-
qtInputs = [ qtdeclarative qtwebchannel qtwebsockets qtpositioning ];
nativeBuildInputs = [
bison
coreutils
···
];
propagatedBuildInputs = [
+
qtdeclarative
+
qtwebchannel
+
qtwebsockets
+
qtpositioning
+
# Image formats
libjpeg
libpng
+1 -1
pkgs/development/libraries/qt-6/modules/qtwebsockets.nix
···
qtModule {
pname = "qtwebsockets";
-
qtInputs = [ qtbase qtdeclarative ];
+
propagatedBuildInputs = [ qtbase qtdeclarative ];
buildInputs = [ openssl ];
}
+3 -3
pkgs/development/libraries/qt-6/modules/qtwebview.nix
···
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 ];
}
+3 -1
pkgs/development/libraries/qt-6/qtModule.nix
···
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;