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

Merge pull request #79168 from helsinki-systems/fix/gnustep-base 

gnustep/base: replace libbfd with binutils-unwrapped
This commit is contained in:
Matthew Bauer 2020-02-03 15:02:36 -05:00 committed by GitHub
parent b07817fbb6 664c02c89b
commit e0595054e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/desktops/gnustep/base/default.nix
View File

@ -3,7 +3,7 @@
, cups , cups
, fetchurl , fetchurl
, gmp, gnutls , gmp, gnutls
, libffi, libbfd , libffi, binutils-unwrapped
, libjpeg, libtiff, libpng, giflib, libungif , libjpeg, libtiff, libpng, giflib, libungif
, libxml2, libxslt, libiconv , libxml2, libxslt, libiconv
, libobjc, libgcrypt , libobjc, libgcrypt
@ -25,7 +25,7 @@ gsmakeDerivation {
aspell audiofile aspell audiofile
cups cups
gmp gnutls gmp gnutls
libffi libbfd libffi binutils-unwrapped
libjpeg libtiff libpng giflib libungif libjpeg libtiff libpng giflib libungif
libxml2 libxslt libiconv libxml2 libxslt libiconv
libobjc libgcrypt libobjc libgcrypt
@ -35,10 +35,6 @@ gsmakeDerivation {
]; ];
patches = [ ./fixup-paths.patch ]; 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 = { meta = {
description = "An implementation of AppKit and Foundation libraries of OPENSTEP and Cocoa"; description = "An implementation of AppKit and Foundation libraries of OPENSTEP and Cocoa";
}; };