diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix index 365996aaf591..c7e7b7d07f5e 100644 --- a/pkgs/applications/graphics/panotools/default.nix +++ b/pkgs/applications/graphics/panotools/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + perl ]; buildInputs = [ libjpeg libpng libtiff - perl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Carbon ]; diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index f752052da2c8..dc2de8b0cd73 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { gettext perl pkg-config + wxGTK32 zip ]; diff --git a/pkgs/applications/networking/ids/zeek/broker/default.nix b/pkgs/applications/networking/ids/zeek/broker/default.nix index 4c0b673c098a..49a13cdb2623 100644 --- a/pkgs/applications/networking/ids/zeek/broker/default.nix +++ b/pkgs/applications/networking/ids/zeek/broker/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { substituteInPlace bindings/python/CMakeLists.txt --replace " -u -r" "" ''; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake python3 ]; buildInputs = [ openssl python3.pkgs.pybind11 ]; propagatedBuildInputs = [ caf' ]; diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index 6beba3f4c6b9..e1ac462330c2 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { file flex python + swig ]; buildInputs = [ @@ -55,7 +56,6 @@ stdenv.mkDerivation rec { libpcap ncurses openssl - swig zlib python ] ++ lib.optionals stdenv.isLinux [ diff --git a/pkgs/applications/science/electronics/flopoco/default.nix b/pkgs/applications/science/electronics/flopoco/default.nix index cf0ebf18ff75..e15ef3277a66 100644 --- a/pkgs/applications/science/electronics/flopoco/default.nix +++ b/pkgs/applications/science/electronics/flopoco/default.nix @@ -54,12 +54,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ bison cmake + flex installShellFiles ]; buildInputs = [ boost - flex gmp libxml2 mpfi diff --git a/pkgs/by-name/ar/arcan/package.nix b/pkgs/by-name/ar/arcan/package.nix index d3eeec5c5838..d472b9f13228 100644 --- a/pkgs/by-name/ar/arcan/package.nix +++ b/pkgs/by-name/ar/arcan/package.nix @@ -41,6 +41,7 @@ valgrind, wayland, wayland-protocols, + wayland-scanner, xcbutil, xcbutilwm, xz, @@ -63,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: { cmake makeWrapper pkg-config + wayland-scanner ] ++ lib.optionals buildManPages [ ruby ]; buildInputs = [ diff --git a/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix b/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix index 0f7ce4b43d11..d55574c0629e 100644 --- a/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix @@ -85,6 +85,7 @@ stdenv.mkDerivation (finalAttrs: { nativeCheckInputs = [ dbus + dbus-test-runner (python3.withPackages (ps: with ps; [ python-dbusmock ])) diff --git a/pkgs/by-name/ce/cemu/package.nix b/pkgs/by-name/ce/cemu/package.nix index 259e2fe18967..6a1e0b50d893 100644 --- a/pkgs/by-name/ce/cemu/package.nix +++ b/pkgs/by-name/ce/cemu/package.nix @@ -73,6 +73,7 @@ in stdenv.mkDerivation (finalAttrs: { nasm ninja pkg-config + wxGTK32 ]; buildInputs = [ diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix index 36df8a7ceac5..ac691786cd1f 100644 --- a/pkgs/by-name/hy/hyprlock/package.nix +++ b/pkgs/by-name/hy/hyprlock/package.nix @@ -11,6 +11,7 @@ pam, wayland, wayland-protocols, + wayland-scanner, cairo, file, libjpeg, @@ -37,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config + wayland-scanner ]; buildInputs = [ diff --git a/pkgs/by-name/ne/nextpnr/package.nix b/pkgs/by-name/ne/nextpnr/package.nix index 49c86cfc2ab3..9b00d388b578 100644 --- a/pkgs/by-name/ne/nextpnr/package.nix +++ b/pkgs/by-name/ne/nextpnr/package.nix @@ -40,10 +40,10 @@ stdenv.mkDerivation rec { sourceRoot = main_src.name; nativeBuildInputs - = [ cmake ] + = [ cmake python3 ] ++ (lib.optional enableGui wrapQtAppsHook); buildInputs - = [ boostPython python3 eigen python3Packages.apycula ] + = [ boostPython eigen python3Packages.apycula ] ++ (lib.optional enableGui qtbase) ++ (lib.optional stdenv.cc.isClang llvmPackages.openmp); diff --git a/pkgs/by-name/ri/ricochet-refresh/package.nix b/pkgs/by-name/ri/ricochet-refresh/package.nix index e0e55bb8c515..8bbc781bb4f5 100644 --- a/pkgs/by-name/ri/ricochet-refresh/package.nix +++ b/pkgs/by-name/ri/ricochet-refresh/package.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config + protobuf cmake qt5.wrapQtAppsHook ]; diff --git a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix index 3025e86f6a70..6179fc5a59c5 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix @@ -127,6 +127,7 @@ stdenv.mkDerivation (finalAttrs: { glib # glib-compile-schemas intltool pkg-config + qtdeclarative validatePkgConfig ]; diff --git a/pkgs/desktops/lomiri/applications/lomiri-system-settings/plugins/lomiri-system-settings-security-privacy.nix b/pkgs/desktops/lomiri/applications/lomiri-system-settings/plugins/lomiri-system-settings-security-privacy.nix index 29a10f12a829..981ad79f8683 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-system-settings/plugins/lomiri-system-settings-security-privacy.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-system-settings/plugins/lomiri-system-settings-security-privacy.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: { cmake pkg-config python3 + qtdeclarative ]; buildInputs = [ diff --git a/pkgs/desktops/lomiri/applications/lomiri/default.nix b/pkgs/desktops/lomiri/applications/lomiri/default.nix index 8d6b3884ad37..e34eaf265b78 100644 --- a/pkgs/desktops/lomiri/applications/lomiri/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri/default.nix @@ -155,8 +155,6 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs tests/whitespace/check_whitespace.py ''; - strictDeps = true; - nativeBuildInputs = [ cmake glib # populates GSETTINGS_SCHEMAS_PATH diff --git a/pkgs/desktops/lomiri/data/lomiri-session/default.nix b/pkgs/desktops/lomiri/data/lomiri-session/default.nix index 351aed9de824..3a9d4fb5a105 100644 --- a/pkgs/desktops/lomiri/data/lomiri-session/default.nix +++ b/pkgs/desktops/lomiri/data/lomiri-session/default.nix @@ -150,8 +150,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { --replace-fail '/usr/libexec/Xwayland.lomiri' '${lib.getBin lomiri}/libexec/Xwayland.lomiri' ''; - strictDeps = true; - nativeBuildInputs = [ cmake makeWrapper diff --git a/pkgs/desktops/lomiri/development/lomiri-api/default.nix b/pkgs/desktops/lomiri/development/lomiri-api/default.nix index 9f699bbd715a..491b95d22a45 100644 --- a/pkgs/desktops/lomiri/development/lomiri-api/default.nix +++ b/pkgs/desktops/lomiri/development/lomiri-api/default.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: { doxygen graphviz pkg-config + qtdeclarative ]; buildInputs = [ diff --git a/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix b/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix index ea44e6babb64..ab19623356bd 100644 --- a/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix +++ b/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix @@ -76,6 +76,7 @@ stdenv.mkDerivation (finalAttrs: { cmake dpkg # for setting LOMIRI_APP_LAUNCH_ARCH gobject-introspection + lttng-ust pkg-config validatePkgConfig ] ++ lib.optionals withDocumentation [ diff --git a/pkgs/desktops/lomiri/development/qtmir/default.nix b/pkgs/desktops/lomiri/development/qtmir/default.nix index 88ac0b69de9c..4cc4f3bb1fef 100644 --- a/pkgs/desktops/lomiri/development/qtmir/default.nix +++ b/pkgs/desktops/lomiri/development/qtmir/default.nix @@ -96,6 +96,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake glib # glib-compile-schemas + lttng-ust pkg-config validatePkgConfig wrapQtAppsHook diff --git a/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix b/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix index d3d23c68f8bf..35eccd897157 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix +++ b/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config + qtdeclarative validatePkgConfig ]; diff --git a/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix b/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix index 854615512d67..8da32d4b1581 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix +++ b/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config + qtdeclarative ]; buildInputs = [ diff --git a/pkgs/desktops/lomiri/services/hfd-service/default.nix b/pkgs/desktops/lomiri/services/hfd-service/default.nix index cdffee5edaef..ff5f34abc294 100644 --- a/pkgs/desktops/lomiri/services/hfd-service/default.nix +++ b/pkgs/desktops/lomiri/services/hfd-service/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config + qtdeclarative ]; buildInputs = [ diff --git a/pkgs/development/compilers/p4c/default.nix b/pkgs/development/compilers/p4c/default.nix index 54d2875d1bc3..060e29809823 100644 --- a/pkgs/development/compilers/p4c/default.nix +++ b/pkgs/development/compilers/p4c/default.nix @@ -76,6 +76,8 @@ stdenv.mkDerivation (finalAttrs: { bison flex cmake + protobuf + python3 ] ++ lib.optionals enableDocumentation [ doxygen graphviz ] ++ lib.optionals enableBPF [ libllvm libbpf ]; @@ -86,7 +88,6 @@ stdenv.mkDerivation (finalAttrs: { boehmgc gmp flex - python3 ]; meta = { diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/development/libraries/cppcms/default.nix index 718c73fd3f5f..86aa687aaa71 100644 --- a/pkgs/development/libraries/cppcms/default.nix +++ b/pkgs/development/libraries/cppcms/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-aXAxx9FB/dIVxr5QkLZuIQamO7PlLwnugSDo78bAiiE="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ pcre zlib python3 openssl ]; + nativeBuildInputs = [ cmake python3 ]; + buildInputs = [ pcre zlib openssl ]; strictDeps = true; diff --git a/pkgs/development/libraries/crocoddyl/default.nix b/pkgs/development/libraries/crocoddyl/default.nix index 8b5c057b8bae..046a6a014d1a 100644 --- a/pkgs/development/libraries/crocoddyl/default.nix +++ b/pkgs/development/libraries/crocoddyl/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + ] ++ lib.optionals pythonSupport [ + python3Packages.python ]; propagatedBuildInputs = lib.optionals (!pythonSupport) [ diff --git a/pkgs/development/libraries/hpp-fcl/default.nix b/pkgs/development/libraries/hpp-fcl/default.nix index ea8c89f53eea..430e1bf16322 100644 --- a/pkgs/development/libraries/hpp-fcl/default.nix +++ b/pkgs/development/libraries/hpp-fcl/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake doxygen + ] ++ lib.optionals pythonSupport [ + python3Packages.numpy ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix index c4b792e673fc..a4a1e03e93ef 100644 --- a/pkgs/development/libraries/liblinphone/default.nix +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -59,7 +59,6 @@ stdenv.mkDerivation rec { jsoncpp libxml2 - (python3.withPackages (ps: [ ps.pystache ps.six ])) sqlite xercesc zxing-cpp @@ -68,6 +67,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake doxygen + (python3.withPackages (ps: [ ps.pystache ps.six ])) ]; strictDeps = true; diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix index a567612fae4f..05c8abfafb2a 100644 --- a/pkgs/development/libraries/partio/default.nix +++ b/pkgs/development/libraries/partio/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { unzip cmake doxygen + python3 ]; buildInputs = [ @@ -38,7 +39,6 @@ stdenv.mkDerivation rec { swig xorg.libXi xorg.libXmu - python3 ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.GLUT diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix index e5ad0e3e63d9..910c40a4e0c0 100644 --- a/pkgs/development/libraries/science/math/clblas/default.nix +++ b/pkgs/development/libraries/science/math/clblas/default.nix @@ -42,10 +42,9 @@ stdenv.mkDerivation rec { "-DBUILD_TEST=OFF" ]; - nativeBuildInputs = [ cmake gfortran ]; + nativeBuildInputs = [ cmake gfortran python3 ]; buildInputs = [ blas - python3 boost ] ++ lib.optionals (!stdenv.isDarwin) [ ocl-icd diff --git a/pkgs/development/tools/parsing/spicy/default.nix b/pkgs/development/tools/parsing/spicy/default.nix index 9738ffb41bca..f9ef5f37df24 100644 --- a/pkgs/development/tools/parsing/spicy/default.nix +++ b/pkgs/development/tools/parsing/spicy/default.nix @@ -24,13 +24,14 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + bison cmake + flex makeWrapper python3 ]; buildInputs = [ - bison flex zlib ]; diff --git a/pkgs/tools/security/grap/default.nix b/pkgs/tools/security/grap/default.nix index 1d77e9bf99cb..4d8f347e048a 100644 --- a/pkgs/tools/security/grap/default.nix +++ b/pkgs/tools/security/grap/default.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { cmake flex python3 + swig4 ]; buildInputs = [ boost.all libseccomp - swig4 ]; strictDeps = true;