about summary refs log tree commit diff
path: root/nixpkgs
diff options
context:
space:
mode:
authorajs124 <git@ajs124.de>2020-02-03 18:42:42 +0100
committerAlyssa Ross <hi@alyssa.is>2020-02-28 00:16:21 +0000
commitcf61dc527405dfee86b1ec6559512b3adf457038 (patch)
tree1c451c2d792ab408eb6c648b223c44e160ab1fbe /nixpkgs
parent906ee15fe2ea97852784bb579233a6b2cdd8b059 (diff)
downloadnixlib-cf61dc527405dfee86b1ec6559512b3adf457038.tar
nixlib-cf61dc527405dfee86b1ec6559512b3adf457038.tar.gz
nixlib-cf61dc527405dfee86b1ec6559512b3adf457038.tar.bz2
nixlib-cf61dc527405dfee86b1ec6559512b3adf457038.tar.lz
nixlib-cf61dc527405dfee86b1ec6559512b3adf457038.tar.xz
nixlib-cf61dc527405dfee86b1ec6559512b3adf457038.tar.zst
nixlib-cf61dc527405dfee86b1ec6559512b3adf457038.zip
gnustep/base: replace libbfd with binutils-unwrapped
Fixes #76927  (second try)

(cherry picked from commit 664c02c89bdafd21e9d0cf4d16baceeb70003185)
Diffstat (limited to 'nixpkgs')
-rw-r--r--nixpkgs/pkgs/desktops/gnustep/base/default.nix8
1 files changed, 2 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/desktops/gnustep/base/default.nix b/nixpkgs/pkgs/desktops/gnustep/base/default.nix
index 87cded31e5ff..7017100565c6 100644
--- a/nixpkgs/pkgs/desktops/gnustep/base/default.nix
+++ b/nixpkgs/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";
   };