1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 03:30:45 +00:00

Merge pull request #328588 from reckenrode/bustle-fixes

bustle: use gettext from nixpkgs
This commit is contained in:
Randy Eckenrode 2024-07-20 09:29:13 -04:00 committed by GitHub
commit 03f12e3d5b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitLab
, buildPackages
, cargo
, meson
, ninja
@ -9,9 +10,12 @@
, rustPlatform
, rustc
, wrapGAppsHook4
, darwin
, gettext
, glib
, gtk4
, libadwaita
, libiconv
}:
stdenv.mkDerivation (finalAttrs: {
@ -32,6 +36,14 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-r29Z+6P+yuCpOBUE3vkESd15lcGXs5+ZTBiQ9nW6DJ4=";
};
env = lib.optionalAttrs stdenv.isDarwin {
# Set the location to gettext to ensure the nixpkgs one on Darwin instead of the vendored one.
# The vendored gettext does not build with clang 16.
GETTEXT_BIN_DIR = "${lib.getBin buildPackages.gettext}/bin";
GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include";
GETTEXT_LIB_DIR = "${lib.getLib gettext}/lib";
};
nativeBuildInputs = [
cargo
meson
@ -48,6 +60,9 @@ stdenv.mkDerivation (finalAttrs: {
glib
gtk4
libadwaita
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Foundation
libiconv
];
meta = with lib; {