colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkgsStatic.glib: don't depend on elfutils 

stdenv.isLinux is not a sufficient check for whether elfutils is
supported, because it's not supported on static Linux.

Fixes: 7517f8edd0 ("glib: switch elfutils in for abandoned libelf")
This commit is contained in:
Alyssa Ross 2024-03-22 22:44:34 +01:00
parent d7dab308bd
commit 2d600be9c4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/glib/default.nix
View File

@ -114,8 +114,9 @@ stdenv.mkDerivation (finalAttrs: {
pcre2
] ++ lib.optionals (!stdenv.hostPlatform.isWindows) [
bash gnum4 # install glib-gettextize and m4 macros for other apps to use
] ++ lib.optionals stdenv.isLinux [
] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
elfutils
] ++ lib.optionals stdenv.isLinux [
libselinux
util-linuxMinimal # for libmount
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
@ -158,7 +159,7 @@ stdenv.mkDerivation (finalAttrs: {
"-Dgtk_doc=${lib.boolToString buildDocs}"
"-Dnls=enabled"
"-Ddevbindir=${placeholder "dev"}/bin"
] ++ lib.optionals (!stdenv.isLinux) [
] ++ lib.optionals (!lib.meta.availableOn stdenv.hostPlatform elfutils) [
"-Dlibelf=disabled"
] ++ lib.optionals (!stdenv.isDarwin) [
"-Dman=true" # broken on Darwin