Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0def56c8ee02
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 063935621c35
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 8, 2020

  1. gnustep/base: add libiberty to linker flags 

    In #76927, we found that
xmemdup is missing when compiling some conftest for gnustep-base. It’s
unclear why this happens but it appears to be from the update to gcc9.
Adding libiberty gives us that symbol and fixes things. What’s less
clear is why this happens to begin with.

Fixes #76927
    @matthewbauer
    matthewbauer committed Jan 8, 2020
    Copy the full SHA
    2c6eaef View commit details

  2. Merge pull request #77336 from matthewbauer/fix-missing-xmemdup-in-gn… 

    …ustep

gnustep/base: add libiberty to linker flags
    @matthewbauer
    matthewbauer authored Jan 8, 2020
    Copy the full SHA
    0639356 View commit details
Showing with 7 additions and 0 deletions.
  1. +7 −0 pkgs/desktops/gnustep/base/default.nix
7 changes: 7 additions & 0 deletions pkgs/desktops/gnustep/base/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@
, libobjc, libgcrypt
, icu
, pkgconfig, portaudio
, libiberty
}:
let
version = "1.26.0";
@@ -30,8 +31,14 @@ gsmakeDerivation {
libobjc libgcrypt
icu
portaudio
libiberty
];
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";
};