From 6c799bae33bc76dc028ba8a17f296b23056c4b3f Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 21 Oct 2023 21:19:28 -0400 Subject: diebahn: fix build on Darwin * Include required frameworks; and * Use gettext from nixpkgs (required for building with newer clangs). --- pkgs/applications/misc/diebahn/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/diebahn/default.nix b/pkgs/applications/misc/diebahn/default.nix index a90dddb3162..ea740346421 100644 --- a/pkgs/applications/misc/diebahn/default.nix +++ b/pkgs/applications/misc/diebahn/default.nix @@ -15,6 +15,7 @@ , gtk4 , libadwaita , pango +, gettext , darwin }: @@ -54,9 +55,19 @@ stdenv.mkDerivation rec { gtk4 libadwaita pango - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + CoreFoundation + Foundation + Security + ]); + + # Darwin needs to link against gettext from nixpkgs instead of the one vendored by gettext-sys + # because the vendored copy does not build with newer versions of clang. + env = lib.optionalAttrs stdenv.isDarwin { + GETTEXT_BIN_DIR = "${lib.getBin gettext}/bin"; + GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include"; + GETTEXT_LIB_DIR = "${lib.getLib gettext}/lib"; + }; meta = { description = "GTK4 frontend for the travel information of the german railway"; -- cgit 1.4.1