diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2020-02-03 15:02:36 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-03 15:02:36 -0500 |
commit | e0595054e36de889aa15a24a1518e6fdc7cbd7da (patch) | |
tree | 969b8a54323d0e17f3b4d818043d76e8c1f20948 /pkgs | |
parent | b07817fbb6ebe94e44aada38d7cab1772c1ab7c2 (diff) | |
parent | 664c02c89bdafd21e9d0cf4d16baceeb70003185 (diff) | |
download | nixlib-e0595054e36de889aa15a24a1518e6fdc7cbd7da.tar nixlib-e0595054e36de889aa15a24a1518e6fdc7cbd7da.tar.gz nixlib-e0595054e36de889aa15a24a1518e6fdc7cbd7da.tar.bz2 nixlib-e0595054e36de889aa15a24a1518e6fdc7cbd7da.tar.lz nixlib-e0595054e36de889aa15a24a1518e6fdc7cbd7da.tar.xz nixlib-e0595054e36de889aa15a24a1518e6fdc7cbd7da.tar.zst nixlib-e0595054e36de889aa15a24a1518e6fdc7cbd7da.zip |
Merge pull request #79168 from helsinki-systems/fix/gnustep-base
gnustep/base: replace libbfd with binutils-unwrapped
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/desktops/gnustep/base/default.nix | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/desktops/gnustep/base/default.nix b/pkgs/desktops/gnustep/base/default.nix index 87cded31e5ff..7017100565c6 100644 --- a/pkgs/desktops/gnustep/base/default.nix +++ b/pkgs/desktops/gnustep/base/default.nix @@ -3,7 +3,7 @@ , cups , fetchurl , gmp, gnutls -, libffi, libbfd +, libffi, binutils-unwrapped , libjpeg, libtiff, libpng, giflib, libungif , libxml2, libxslt, libiconv , libobjc, libgcrypt @@ -25,7 +25,7 @@ gsmakeDerivation { aspell audiofile cups gmp gnutls - libffi libbfd + libffi binutils-unwrapped libjpeg libtiff libpng giflib libungif libxml2 libxslt libiconv libobjc libgcrypt @@ -35,10 +35,6 @@ gsmakeDerivation { ]; patches = [ ./fixup-paths.patch ]; - # Bump to gcc9 has give missing xmemdup symbols. Need libiberty here - # to resolve it, unclear why. See #76927 for more info - NIX_LDFLAGS = "-liberty"; - meta = { description = "An implementation of AppKit and Foundation libraries of OPENSTEP and Cocoa"; }; |