dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

bustle: use gettext from nixpkgs

Browse Source 
The vendored gettext fails to build with clang 16 on Darwin. The gettext in nixpkgs works.
This commit is contained in:
Randy Eckenrode 2024-07-19 23:15:40 -04:00
parent 82cbb284d3
commit 58b9659b65
No known key found for this signature in database
GPG Key ID: 64C1CD4EC2A600D9
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/by-name/bu/bustle/package.nix
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; {