From a802048d43facd9da6fd5fa4a5137f1c42633960 Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Tue, 18 Jun 2024 22:32:43 +0000
Subject: [PATCH 01/30] ayatana-indicator-datetime: fix strict deps

dbus-test-runner is executed and thus required in nativeCheckInputs
---
 pkgs/by-name/ay/ayatana-indicator-datetime/package.nix | 1 +
 1 file changed, 1 insertion(+)

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
     ]))

From 6d48747e20ee148bbb0c70d37a987a3d5a7638a1 Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Tue, 18 Jun 2024 22:38:32 +0000
Subject: [PATCH 02/30] clblas: fix strict deps

move python3 from buildInputs to nativeBuildInputs
---
 pkgs/development/libraries/science/math/clblas/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

From f88ef5b4f963bd3def6cdc1f9ed0f885fd1aed02 Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Wed, 19 Jun 2024 01:12:06 +0000
Subject: [PATCH 03/30] cppcms: fix strict deps

move python3 from buildInputs to nativeBuildInputs
---
 pkgs/development/libraries/cppcms/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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;
 

From 7bf49fe2c1d274b92406b48d6b1be441d57bcf9a Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Wed, 19 Jun 2024 01:17:23 +0000
Subject: [PATCH 04/30] flopoco: fix strict deps

move flex from buildInputs to nativeBuildInputs
---
 pkgs/applications/science/electronics/flopoco/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From fe9118678b1c89d5dc29b5a02250135592e1916e Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Wed, 19 Jun 2024 01:26:38 +0000
Subject: [PATCH 05/30] grap: fix strict deps

move swig4 from buildInputs to nativeBuildInputs
---
 pkgs/tools/security/grap/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;

From bf282d892145e7e2cab221ff35d0dfa7e16f5a26 Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Wed, 19 Jun 2024 01:48:56 +0000
Subject: [PATCH 06/30] hyprlock: fix strict deps

requires wayland-scanner (wayland) in nativeBuildInputs
---
 pkgs/by-name/hy/hyprlock/package.nix | 2 ++
 1 file changed, 2 insertions(+)

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 = [

From 0809c206cc4ef7e2f78bc8eab11a0f152b24c397 Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Wed, 19 Jun 2024 04:58:30 +0000
Subject: [PATCH 07/30] liblinphone: fix strict deps

move python3 to nativeBuildInputs
---
 pkgs/development/libraries/liblinphone/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;

From a99b6096f6da8326447c697beee54bff00b206ca Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Wed, 19 Jun 2024 05:05:50 +0000
Subject: [PATCH 08/30] lomiri.hfd-service: fix strict deps

add qtdeclarative to nativeBuildInputs
---
 pkgs/desktops/lomiri/services/hfd-service/default.nix | 1 +
 1 file changed, 1 insertion(+)

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 = [

From dea5c24789718d82425666d70d6dbc9892ce2355 Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Wed, 19 Jun 2024 05:27:58 +0000
Subject: [PATCH 09/30] lomiri.qtmir: fix strict deps

add lttng-ust to nativeBuildInputs
---
 pkgs/desktops/lomiri/development/qtmir/default.nix | 1 +
 1 file changed, 1 insertion(+)

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

From cabdc892648e7fd27f03a45adae9ae0f5b1ce9bd Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Wed, 19 Jun 2024 05:38:32 +0000
Subject: [PATCH 10/30] lomiri.lomiri-system-settings-unwrapped: fix strict
 deps

add qtdeclarative to nativeBuildInputs
---
 .../lomiri/applications/lomiri-system-settings/default.nix       | 1 +
 1 file changed, 1 insertion(+)

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

From 341a00f30c3b21b07775b224449bec42265d498c Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Wed, 19 Jun 2024 05:40:37 +0000
Subject: [PATCH 11/30] lomiri.lomiri-action-api: fix strict deps

add qtdeclarative to nativeBuildInputs
---
 pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix | 1 +
 1 file changed, 1 insertion(+)

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

From a91fcac65388febf6e54e52c8a3303f09588043e Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Wed, 19 Jun 2024 05:42:43 +0000
Subject: [PATCH 12/30] lomiri.lomiri-api: fix strict deps

add qtdeclarative to natvieBuildInputs
---
 pkgs/desktops/lomiri/development/lomiri-api/default.nix | 1 +
 1 file changed, 1 insertion(+)

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 = [

From 6f98ebba68ce58de94c3031bb275ab007969435d Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Wed, 19 Jun 2024 05:44:41 +0000
Subject: [PATCH 13/30] lomiri.lomiri-app-launch: fix strict deps

add lttng-ust to nativeBuildInputs
---
 pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix | 1 +
 1 file changed, 1 insertion(+)

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 [

From 66f7b5b5cb98328a8794f839cd44d28e40e7bd7c Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Wed, 19 Jun 2024 05:54:41 +0000
Subject: [PATCH 14/30] lomiri.lomiri-session: disable strict deps

build searches for executables in path to install in script. this
doesn't work with strict deps
---
 pkgs/desktops/lomiri/data/lomiri-session/default.nix | 2 --
 1 file changed, 2 deletions(-)

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

From 3645a16df6cbcbeb922d2db1a2385864d8012bb7 Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Wed, 19 Jun 2024 05:57:58 +0000
Subject: [PATCH 15/30] lomiri.lomiri-settings-components: fix strict deps

add qtdeclarative to nativeBuildInputs
---
 pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix | 1 +
 1 file changed, 1 insertion(+)

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 = [

From 196c6832961036413c27c042aa6322d1f4cecb65 Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Wed, 19 Jun 2024 05:59:02 +0000
Subject: [PATCH 16/30] lomiri.lomiri-system-settings-security-privacy: fix
 strict deps

add qtdeclarative to nativeBuildInputs
---
 .../plugins/lomiri-system-settings-security-privacy.nix          | 1 +
 1 file changed, 1 insertion(+)

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 = [

From 9ff361bf1fd7e5b276cadf9bd7e985a8a9a13b77 Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Wed, 19 Jun 2024 06:11:29 +0000
Subject: [PATCH 17/30] lomiri.lomiri: disable strict deps

configure phase looks for executables to be used in the runtime which is
not compatible with strictDeps.
---
 pkgs/desktops/lomiri/applications/lomiri/default.nix | 2 --
 1 file changed, 2 deletions(-)

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

From 4337744556b5bc0bdb6044b4e2e2bf2eddf9cbb3 Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Wed, 19 Jun 2024 06:22:00 +0000
Subject: [PATCH 18/30] nextpnr: fix strict deps

move python3 from buildInputs to nativeBuildInputs
---
 pkgs/by-name/ne/nextpnr/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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);
 

From bd43a32e50a7c578f0cb11831e5cff7a7462f7ad Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Wed, 19 Jun 2024 09:39:52 +0000
Subject: [PATCH 19/30] p4c: fix strict deps

add python3 and protobuf to nativeBuildInputs
---
 pkgs/development/compilers/p4c/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 = {

From 4bf065f7df29337730c94ace7d2a614efcec2da5 Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Wed, 19 Jun 2024 09:45:10 +0000
Subject: [PATCH 20/30] panotools: fix strict deps

move perl to nativeBuildInputs
---
 pkgs/applications/graphics/panotools/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 75cfdd39e0842945366883faa136cb4ac2b3c90f Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Wed, 19 Jun 2024 09:51:09 +0000
Subject: [PATCH 21/30] partio: fix strict deps

move python3 to nativeBuildInputs
---
 pkgs/development/libraries/partio/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 265155d89766ba580fbf3b84df9b6f1cdc0e4fff Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Wed, 19 Jun 2024 09:56:43 +0000
Subject: [PATCH 22/30] pwsafe: fix strict deps

add wxGTK32 to nativeBuildInputs
---
 pkgs/applications/misc/pwsafe/default.nix | 1 +
 1 file changed, 1 insertion(+)

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

From 6aff48c3a9cd8b7ec1ad796e09dfbb5c0869eb89 Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Wed, 19 Jun 2024 10:00:47 +0000
Subject: [PATCH 23/30] python311Packages.hpp-fcl: fix strict deps

add python3Packages.numpy to nativeBuildInputs
---
 pkgs/development/libraries/hpp-fcl/default.nix | 2 ++
 1 file changed, 2 insertions(+)

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 = [

From 745ab2c3f2324e7d44d351f43be19a7ffbd99f37 Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Wed, 19 Jun 2024 10:23:45 +0000
Subject: [PATCH 24/30] ricochet-refresh: fix strict deps

add protobuf to nativeBuildInputs
---
 pkgs/by-name/ri/ricochet-refresh/package.nix | 1 +
 1 file changed, 1 insertion(+)

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

From 9aa4cc28d6404ebf94130eafd3ea703b1c935984 Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Wed, 19 Jun 2024 10:31:15 +0000
Subject: [PATCH 25/30] spicy-parser-generator: fix strict deps

add flex & bison to nativeBuildInputs
---
 pkgs/development/tools/parsing/spicy/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

From 04cb206795e8bd27ccaf5824c6121a8b5c20277f Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Wed, 19 Jun 2024 15:37:59 +0000
Subject: [PATCH 26/30] zeek: fix strict deps

move swig to nativeBuildInputs
---
 pkgs/applications/networking/ids/zeek/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 [

From 5f5e6c62346c909762d1054124cbaa2935aa01db Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Wed, 19 Jun 2024 19:44:45 +0000
Subject: [PATCH 27/30] python312Packages.zeek: fix strict deps

add python3 to nativeBuildInputs
---
 pkgs/applications/networking/ids/zeek/broker/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/ids/zeek/broker/default.nix b/pkgs/applications/networking/ids/zeek/broker/default.nix
index 1e9b6f3f0c08..4e2ce17de951 100644
--- a/pkgs/applications/networking/ids/zeek/broker/default.nix
+++ b/pkgs/applications/networking/ids/zeek/broker/default.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
     substituteInPlace bindings/python/CMakeLists.txt --replace " -u -r" ""
   '';
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake python3 ];
   buildInputs = [ openssl python3.pkgs.pybind11 ];
   propagatedBuildInputs = [ caf' ];
 

From 0ac2c427e07e403c9f9467d2ca2b4471ff4c3389 Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Thu, 25 Jul 2024 07:21:21 +0000
Subject: [PATCH 28/30] cemu: fix strict deps

add wxGTK32 to nativeBuildInputs
---
 pkgs/by-name/ce/cemu/package.nix | 1 +
 1 file changed, 1 insertion(+)

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 = [

From d6c9baab19aebfb90ccbe6388d18d4bfcf17d4c4 Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Thu, 25 Jul 2024 07:21:56 +0000
Subject: [PATCH 29/30] arcan: fix strict deps

add wayland-scanner to nativeBuildInputs
---
 pkgs/by-name/ar/arcan/package.nix | 2 ++
 1 file changed, 2 insertions(+)

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 = [

From 72a4d2a2adb8a84ee225e8f76a80b94d98b63d26 Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Thu, 25 Jul 2024 07:22:58 +0000
Subject: [PATCH 30/30] python312Packages.crocoddyl: fix strict deps

add python3Packages.python to nativeBuildInputs
---
 pkgs/development/libraries/crocoddyl/default.nix | 2 ++
 1 file changed, 2 insertions(+)

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) [