From e7008f03e78b7a68fc402e1abe0d4d632c465b95 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Fri, 3 Jan 2025 11:24:34 +0100 Subject: [PATCH 1/2] xylib: fix cross / strictDeps build --- pkgs/by-name/xy/xylib/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/xy/xylib/package.nix b/pkgs/by-name/xy/xylib/package.nix index 50ac7586546a1..7c67780213970 100644 --- a/pkgs/by-name/xy/xylib/package.nix +++ b/pkgs/by-name/xy/xylib/package.nix @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { wxGTK32 ]; + configureFlags = [ + "--with-wx-config=${lib.getExe' (lib.getDev wxGTK32) "wx-config"}" + ]; + meta = with lib; { description = "Portable library for reading files that contain x-y data from powder diffraction, spectroscopy and other experimental methods"; license = licenses.lgpl21; From 8c40a322b357d882e1f98c783d6709f624e968f9 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Fri, 3 Jan 2025 11:24:34 +0100 Subject: [PATCH 2/2] fityk: fix cross / strictDeps build --- pkgs/by-name/fi/fityk/package.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fi/fityk/package.nix b/pkgs/by-name/fi/fityk/package.nix index 581b717c0be84..b20eb0ea4a3e5 100644 --- a/pkgs/by-name/fi/fityk/package.nix +++ b/pkgs/by-name/fi/fityk/package.nix @@ -25,7 +25,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-m2RaZMYT6JGwa3sOUVsBIzCdZetTbiygaInQWoJ4m1o="; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ + autoreconfHook + lua + swig + ]; buildInputs = [ wxGTK32 boost @@ -35,7 +39,10 @@ stdenv.mkDerivation rec { xylib readline gnuplot - swig + ]; + + configureFlags = [ + "--with-wx-config=${lib.getExe' (lib.getDev wxGTK32) "wx-config"}" ]; env.NIX_CFLAGS_COMPILE = toString [