Merge pull request #324545 from paparodeo/treewide-strict-deps-fixes

treewide: fix packages that use cmake strict deps when cmake strict deps works
2024-07-27 22:19:23 +03:00
parent 08e37800ff 72a4d2a2ad
commit 63cc38bf10
30 changed files with 36 additions and 19 deletions
@@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: {

  nativeBuildInputs = [
    cmake
+    perl
  ];

  buildInputs = [
    libjpeg
    libpng
    libtiff
-    perl
  ] ++ lib.optionals stdenv.isDarwin [
    darwin.apple_sdk.frameworks.Carbon
  ];
@@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
    gettext
    perl
    pkg-config
+    wxGTK32
    zip
  ];

@@ -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' ];

@@ -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 [
@@ -54,12 +54,12 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [
    bison
    cmake
+    flex
    installShellFiles
  ];

  buildInputs = [
    boost
-    flex
    gmp
    libxml2
    mpfi
@@ -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 = [
@@ -85,6 +85,7 @@ stdenv.mkDerivation (finalAttrs: {

  nativeCheckInputs = [
    dbus
+    dbus-test-runner
    (python3.withPackages (ps: with ps; [
      python-dbusmock
    ]))
@@ -73,6 +73,7 @@ in stdenv.mkDerivation (finalAttrs: {
    nasm
    ninja
    pkg-config
+    wxGTK32
  ];

  buildInputs = [
@@ -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 = [
@@ -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);

@@ -37,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: {

  nativeBuildInputs = [
    pkg-config
+    protobuf
    cmake
    qt5.wrapQtAppsHook
  ];
@@ -127,6 +127,7 @@ stdenv.mkDerivation (finalAttrs: {
    glib # glib-compile-schemas
    intltool
    pkg-config
+    qtdeclarative
    validatePkgConfig
  ];

@@ -41,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
    cmake
    pkg-config
    python3
+    qtdeclarative
  ];

  buildInputs = [
@@ -155,8 +155,6 @@ stdenv.mkDerivation (finalAttrs: {
    patchShebangs tests/whitespace/check_whitespace.py
  '';

-  strictDeps = true;
-
  nativeBuildInputs = [
    cmake
    glib # populates GSETTINGS_SCHEMAS_PATH
@@ -150,8 +150,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
      --replace-fail '/usr/libexec/Xwayland.lomiri' '${lib.getBin lomiri}/libexec/Xwayland.lomiri'
  '';

-  strictDeps = true;
-
  nativeBuildInputs = [
    cmake
    makeWrapper
@@ -60,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
    doxygen
    graphviz
    pkg-config
+    qtdeclarative
  ];

  buildInputs = [
@@ -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 [
@@ -96,6 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
  nativeBuildInputs = [
    cmake
    glib # glib-compile-schemas
+    lttng-ust
    pkg-config
    validatePkgConfig
    wrapQtAppsHook
@@ -39,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
  nativeBuildInputs = [
    cmake
    pkg-config
+    qtdeclarative
    validatePkgConfig
  ];

@@ -36,6 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
  nativeBuildInputs = [
    cmake
    pkg-config
+    qtdeclarative
  ];

  buildInputs = [
@@ -45,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
  nativeBuildInputs = [
    cmake
    pkg-config
+    qtdeclarative
  ];

  buildInputs = [
@@ -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 = {
@@ -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;

@@ -23,6 +23,8 @@ stdenv.mkDerivation (finalAttrs: {

  nativeBuildInputs = [
    cmake
+  ] ++ lib.optionals pythonSupport [
+    python3Packages.python
  ];

  propagatedBuildInputs = lib.optionals (!pythonSupport) [
@@ -29,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
  nativeBuildInputs = [
    cmake
    doxygen
+  ] ++ lib.optionals pythonSupport [
+    python3Packages.numpy
  ];

  propagatedBuildInputs = [
@@ -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;
@@ -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
@@ -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
@@ -24,13 +24,14 @@ stdenv.mkDerivation rec {
  };

  nativeBuildInputs = [
+    bison
    cmake
+    flex
    makeWrapper
    python3
  ];

  buildInputs = [
-    bison
    flex
    zlib
  ];
@@ -16,12 +16,12 @@ stdenv.mkDerivation rec {
    cmake
    flex
    python3
+    swig4
  ];

  buildInputs = [
    boost.all
    libseccomp
-    swig4
  ];

  strictDeps = true;