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

glib: switch elfutils in for abandoned libelf

Browse Source 
On Darwin and non-Linux, don't provide anything.
This commit is contained in:
Philip Taron 2024-02-16 21:05:10 -08:00
parent 3cf2b6d3f2
commit 7517f8edd0
No known key found for this signature in database
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@
, pkg-config , pkg-config
, perl , perl
, python3 , python3
, libiconv, zlib, libffi, pcre2, libelf, gnome, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45, libxslt , libiconv, zlib, libffi, pcre2, elfutils, gnome, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45, libxslt
# use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib) # use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib)
, util-linuxMinimal ? null , util-linuxMinimal ? null
, buildPackages , buildPackages
@ -110,12 +110,12 @@ stdenv.mkDerivation (finalAttrs: {
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
buildInputs = [ buildInputs = [
libelf
finalAttrs.setupHook finalAttrs.setupHook
pcre2 pcre2
] ++ lib.optionals (!stdenv.hostPlatform.isWindows) [ ] ++ lib.optionals (!stdenv.hostPlatform.isWindows) [
bash gnum4 # install glib-gettextize and m4 macros for other apps to use bash gnum4 # install glib-gettextize and m4 macros for other apps to use
] ++ lib.optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
elfutils
libselinux libselinux
util-linuxMinimal # for libmount util-linuxMinimal # for libmount
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
@ -158,6 +158,8 @@ stdenv.mkDerivation (finalAttrs: {
"-Dgtk_doc=${lib.boolToString buildDocs}" "-Dgtk_doc=${lib.boolToString buildDocs}"
"-Dnls=enabled" "-Dnls=enabled"
"-Ddevbindir=${placeholder "dev"}/bin" "-Ddevbindir=${placeholder "dev"}/bin"
] ++ lib.optionals (!stdenv.isLinux) [
"-Dlibelf=disabled"
] ++ lib.optionals (!stdenv.isDarwin) [ ] ++ lib.optionals (!stdenv.isDarwin) [
"-Dman=true" # broken on Darwin "-Dman=true" # broken on Darwin
] ++ lib.optionals stdenv.isFreeBSD [ ] ++ lib.optionals stdenv.isFreeBSD [