From 2a6ea1be572cbab04c870d7005c60679d0aabc01 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 2 Jan 2025 11:55:38 +0100 Subject: [PATCH 01/13] flwrap: fix cross build --- pkgs/by-name/fl/flwrap/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flwrap/package.nix b/pkgs/by-name/fl/flwrap/package.nix index e1a4f93a179f..1666191e48a5 100644 --- a/pkgs/by-name/fl/flwrap/package.nix +++ b/pkgs/by-name/fl/flwrap/package.nix @@ -16,13 +16,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-g1V7bOcgVHpD+Ndn02Nj4I3rGItuQ2qLGlrZZshfGP8="; }; + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ fltk13 libjpeg ]; - nativeBuildInputs = [ - pkg-config + configureFlags = [ + "FLTK_CONFIG=${lib.getExe' (lib.getDev fltk13) "fltk-config"}" ]; meta = { From 172d46ee3c773fa212c13e71d73ded157dde2960 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 2 Jan 2025 11:55:38 +0100 Subject: [PATCH 02/13] fastjet: fix cross build --- pkgs/by-name/fa/fastjet/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/fa/fastjet/package.nix b/pkgs/by-name/fa/fastjet/package.nix index cdb7394c9688..f64e8acad983 100644 --- a/pkgs/by-name/fa/fastjet/package.nix +++ b/pkgs/by-name/fa/fastjet/package.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { hash = "sha256-zBdUcb+rhla4xhg6jl6a0F1fdQbkbzISqagjCQW49qM="; }; + postPatch = '' + patchShebangs --build fastjet-config.in + ''; + buildInputs = lib.optional withPython python; configureFlags = [ From f01beefa3d3da9c1ea06947f0731166f9cda1ad9 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 2 Jan 2025 11:55:38 +0100 Subject: [PATCH 03/13] fastjet-contrib: fix cross build --- pkgs/by-name/fa/fastjet-contrib/package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fastjet-contrib/package.nix b/pkgs/by-name/fa/fastjet-contrib/package.nix index 4bb49c711d58..5e39dcb3b8fc 100644 --- a/pkgs/by-name/fa/fastjet-contrib/package.nix +++ b/pkgs/by-name/fa/fastjet-contrib/package.nix @@ -17,10 +17,12 @@ stdenv.mkDerivation rec { buildInputs = [ fastjet ]; postPatch = '' - for f in Makefile.in */Makefile; do + for f in Makefile.in */Makefile scripts/internal/Template/Makefile; do substituteInPlace "$f" --replace "CXX=g++" "" + substituteInPlace "$f" --replace-quiet "ar " "${stdenv.cc.targetPrefix}ar " + substituteInPlace "$f" --replace-quiet "ranlib " "${stdenv.cc.targetPrefix}ranlib " done - patchShebangs ./utils/check.sh ./utils/install-sh + patchShebangs --build ./utils/check.sh ./utils/install-sh ''; # Written in shell manually, does not support autoconf-style @@ -28,6 +30,10 @@ stdenv.mkDerivation rec { # Error: --build=x86_64-unknown-linux-gnu: unrecognised argument configurePlatforms = [ ]; + configureFlags = [ + "--fastjet-config=${lib.getExe' (lib.getDev fastjet) "fastjet-config"}" + ]; + enableParallelBuilding = true; doCheck = true; From 045d5755a2f05a585665d3ca13a8b869a5957bf8 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 2 Jan 2025 11:55:38 +0100 Subject: [PATCH 04/13] flpsed: fix cross build --- pkgs/by-name/fl/flpsed/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/fl/flpsed/package.nix b/pkgs/by-name/fl/flpsed/package.nix index 479c2902902a..cfa8f3d05124 100644 --- a/pkgs/by-name/fl/flpsed/package.nix +++ b/pkgs/by-name/fl/flpsed/package.nix @@ -23,6 +23,12 @@ stdenv.mkDerivation rec { -i src/GsWidget.cxx ''; + configureFlags = [ + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + "FLTKCONFIG=${lib.getExe' (lib.getDev fltk13) "fltk-config"}" + ]; + meta = with lib; { description = "WYSIWYG PostScript annotator"; homepage = "https://flpsed.org/flpsed.html"; From b3b3fe03c458a4e929705f36cddcbf87d21149a7 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 2 Jan 2025 11:55:38 +0100 Subject: [PATCH 05/13] SDL_gfx: fix cross build --- pkgs/by-name/sd/SDL_gfx/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sd/SDL_gfx/package.nix b/pkgs/by-name/sd/SDL_gfx/package.nix index a6044b31790f..65711ff5e396 100644 --- a/pkgs/by-name/sd/SDL_gfx/package.nix +++ b/pkgs/by-name/sd/SDL_gfx/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-37FaxfjOeklS3BLSrtl0dRjF5rM1wOMWNtI/k8Yw9Bk="; }; - nativeBuildInputs = [ SDL ]; - buildInputs = [ SDL ]; # SDL_gfx.pc refers to sdl.pc and some SDL_gfx headers import SDL.h propagatedBuildInputs = [ SDL ]; + env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config"; + configureFlags = [ (lib.enableFeature false "mmx") (lib.enableFeature enableSdltest "sdltest") From a0aefa462bfe5401f51048a470183c83ae24f612 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 2 Jan 2025 11:55:38 +0100 Subject: [PATCH 06/13] SDL_mixer: fix cross build --- pkgs/by-name/sd/SDL_mixer/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sd/SDL_mixer/package.nix b/pkgs/by-name/sd/SDL_mixer/package.nix index e42592d5bc58..bedfda42842a 100644 --- a/pkgs/by-name/sd/SDL_mixer/package.nix +++ b/pkgs/by-name/sd/SDL_mixer/package.nix @@ -70,9 +70,7 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeBuildInputs = [ - SDL pkg-config - smpeg ]; buildInputs = [ @@ -84,6 +82,10 @@ stdenv.mkDerivation (finalAttrs: { smpeg ]; + # pass in correct *-config for cross builds + env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config"; + env.SMPEG_CONFIG = lib.getExe' smpeg.dev "smpeg-config"; + configureFlags = [ (lib.enableFeature false "music-ogg-shared") (lib.enableFeature false "music-mod-shared") From 70ffa2d78517310567ea2a5168f018cbd3d36f21 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 2 Jan 2025 11:55:38 +0100 Subject: [PATCH 07/13] gtk2: fix cross / strictDeps build --- pkgs/development/libraries/gtk/2.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index 9b1a3fc32439..d1abe9b8e035 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = finalAttrs.setupHooks ++ [ + gdk-pixbuf gettext gobject-introspection perl From 639b190d8254478387b0116336897fd92bbcf331 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 2 Jan 2025 11:55:38 +0100 Subject: [PATCH 08/13] freedroidrpg: fix cross build --- pkgs/by-name/fr/freedroidrpg/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/fr/freedroidrpg/package.nix b/pkgs/by-name/fr/freedroidrpg/package.nix index 9be15316e687..021abb8c7e9b 100644 --- a/pkgs/by-name/fr/freedroidrpg/package.nix +++ b/pkgs/by-name/fr/freedroidrpg/package.nix @@ -56,6 +56,8 @@ stdenv.mkDerivation { zlib ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; + env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config"; + enableParallelBuilding = true; meta = with lib; { From a7b52c47963f68a4c8b7acf3bcc6e635ec68e240 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 2 Jan 2025 11:55:38 +0100 Subject: [PATCH 09/13] fish-fillets-ng: fix cross / strictDeps build --- pkgs/by-name/fi/fish-fillets-ng/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/fi/fish-fillets-ng/package.nix b/pkgs/by-name/fi/fish-fillets-ng/package.nix index 7a0a88f9739d..73011c6bafd3 100644 --- a/pkgs/by-name/fi/fish-fillets-ng/package.nix +++ b/pkgs/by-name/fi/fish-fillets-ng/package.nix @@ -37,6 +37,13 @@ stdenv.mkDerivation rec { SDL_ttf ]; + # pass in correct sdl-config for cross builds + env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config"; + + makeFlags = [ + "AR=${stdenv.cc.targetPrefix}ar" + ]; + desktopItems = [ (makeDesktopItem { name = "fish-fillets-ng"; From 8a5f060b32dad9ef86b783bca141e8aed8c70262 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 2 Jan 2025 11:55:38 +0100 Subject: [PATCH 10/13] SDL_ttf: fix cross / strictDeps build --- pkgs/by-name/sd/SDL_ttf/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sd/SDL_ttf/package.nix b/pkgs/by-name/sd/SDL_ttf/package.nix index d243dc90ab12..df6ce3b42ec7 100644 --- a/pkgs/by-name/sd/SDL_ttf/package.nix +++ b/pkgs/by-name/sd/SDL_ttf/package.nix @@ -33,10 +33,9 @@ stdenv.mkDerivation (finalAttrs: { freetype ]; - nativeBuildInputs = [ - SDL - freetype - ]; + # pass in correct *-config for cross builds + env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config"; + env.FREETYPE_CONFIG = lib.getExe' freetype.dev "freetype-config"; configureFlags = [ (lib.enableFeature enableSdltest "sdltest") From 3422fb581d03e075d741712357f02235883afc49 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 2 Jan 2025 11:55:38 +0100 Subject: [PATCH 11/13] fllog: fix cross / strictDeps build --- pkgs/by-name/fl/fllog/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/fl/fllog/package.nix b/pkgs/by-name/fl/fllog/package.nix index 00d3de60d783..f69b5aa0cfb3 100644 --- a/pkgs/by-name/fl/fllog/package.nix +++ b/pkgs/by-name/fl/fllog/package.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + fltk13 # fltk-config pkg-config ]; From ec1af801cb24f2d207f08ae794a08830ab26ecb3 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 2 Jan 2025 11:55:38 +0100 Subject: [PATCH 12/13] lvtk: install includes in regular location ttl2c (next commit) looks for them there. --- pkgs/by-name/lv/lvtk/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/lv/lvtk/package.nix b/pkgs/by-name/lv/lvtk/package.nix index fc5dacaba82d..7e0b9f8ff379 100644 --- a/pkgs/by-name/lv/lvtk/package.nix +++ b/pkgs/by-name/lv/lvtk/package.nix @@ -37,11 +37,15 @@ stdenv.mkDerivation (finalAttrs: { pugl ]; + postInstall = '' + mv $out/include/lvtk-3.0/lvtk $out/include/ + rmdir $out/include/lvtk-3.0/ + ''; + enableParallelBuilding = true; meta = { description = "Set C++ wrappers around the LV2 C API"; - mainProgram = "ttl2c"; homepage = "https://lvtk.org/"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ bot-wxt1221 ]; From 943657de1c36d8a24932ff0b64a6980d8f6358f0 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 2 Jan 2025 11:55:38 +0100 Subject: [PATCH 13/13] fcitx5-mcbopomofo: fix strictDeps build --- pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix b/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix index 698329d15ec2..e5b499f20f8a 100644 --- a/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix +++ b/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix @@ -28,16 +28,19 @@ stdenv.mkDerivation rec { cmake extra-cmake-modules gettext - json_c - icu - fmt gtest ]; buildInputs = [ fcitx5 + fmt + gtest + icu + json_c ]; + strictDeps = true; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];