Unverified Commit 7517f8ed authored by Philip Taron's avatar Philip Taron
Browse files

glib: switch elfutils in for abandoned libelf 

On Darwin and non-Linux, don't provide anything.
parent 3cf2b6d3

pkgs/development/libraries/glib/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
, pkg-config

, perl

, 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)

, util-linuxMinimal ? null

, buildPackages
@@ -110,12 +110,12 @@ stdenv.mkDerivation (finalAttrs: { 
  setupHook = ./setup-hook.sh;



  buildInputs = [

    libelf

    finalAttrs.setupHook

    pcre2

  ] ++ lib.optionals (!stdenv.hostPlatform.isWindows) [

    bash gnum4 # install glib-gettextize and m4 macros for other apps to use

  ] ++ lib.optionals stdenv.isLinux [

    elfutils

    libselinux

    util-linuxMinimal # for libmount

  ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
@@ -158,6 +158,8 @@ stdenv.mkDerivation (finalAttrs: { 
    "-Dgtk_doc=${lib.boolToString buildDocs}"

    "-Dnls=enabled"

    "-Ddevbindir=${placeholder "dev"}/bin"

  ] ++ lib.optionals (!stdenv.isLinux) [

    "-Dlibelf=disabled"

  ] ++ lib.optionals (!stdenv.isDarwin) [

    "-Dman=true"                # broken on Darwin

  ] ++ lib.optionals stdenv.isFreeBSD [