git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #79168 from helsinki-systems/fix/gnustep-base

gnustep/base: replace libbfd with binutils-unwrapped

commite0595054e36de889aa15a24a1518e6fdc7cbd7da authorMatthew Bauer <mjbauer95@gmail.com> dateMon 3 Feb 2020, 15:02 (7 years ago) parentb07817f664c02c
1 file changed+2−6
pkgs/desktops/gnustep/base/default.nix+2−6
pkgs/desktops/gnustep/base/default.nix+2−6
@@ -3,7 +3,7 @@
33, cups
44, fetchurl
55, gmp, gnutls
6−, libffi, libbfd
6+, libffi, binutils-unwrapped
77, libjpeg, libtiff, libpng, giflib, libungif
88, libxml2, libxslt, libiconv
99, libobjc, libgcrypt
@@ -25,7 +25,7 @@ gsmakeDerivation {
2525 aspell audiofile
2626 cups
2727 gmp gnutls
28− libffi libbfd
28+ libffi binutils-unwrapped
2929 libjpeg libtiff libpng giflib libungif
3030 libxml2 libxslt libiconv
3131 libobjc libgcrypt
@@ -35,10 +35,6 @@ gsmakeDerivation {
3535 ];
3636 patches = [ ./fixup-paths.patch ];
3737
38− # Bump to gcc9 has give missing xmemdup symbols. Need libiberty here
39− # to resolve it, unclear why. See #76927 for more info
40− NIX_LDFLAGS = "-liberty";
41−
4238 meta = {
4339 description = "An implementation of AppKit and Foundation libraries of OPENSTEP and Cocoa";
4440 };