diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-03-22 22:44:34 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-03-23 11:37:20 +0100 |
commit | 2d600be9c48204f0da05076bf8927cad6118f0d9 (patch) | |
tree | 3a852d2ad8dcf440bf34bc4a5a92c8bed5716fa5 /pkgs/development/libraries/glib | |
parent | d7dab308bdfe374e891c2e9082a34278949185c0 (diff) |
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: 7517f8edd06c ("glib: switch elfutils in for abandoned libelf")
Diffstat (limited to 'pkgs/development/libraries/glib')
-rw-r--r-- | pkgs/development/libraries/glib/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index c71b24107f6b1..7c14141554fb4 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -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 |