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: 859a395209f8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 58388e6e119b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 12, 2020

  1. audiofile: fix static build 

    Fixes #103215
    @expipiplus1
    expipiplus1 committed Nov 12, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c3b1e7e View commit details

  2. Merge pull request #103270 from expipiplus1/joe-audiofile 

    audiofile: fix static build
    @Mic92
    Mic92 authored Nov 12, 2020
    Copy the full SHA
    58388e6 View commit details
Showing with 15 additions and 0 deletions.
  1. +15 −0 pkgs/development/libraries/audiofile/default.nix
15 changes: 15 additions & 0 deletions pkgs/development/libraries/audiofile/default.nix
View file
Original file line number Diff line number Diff line change
@@ -28,6 +28,21 @@ stdenv.mkDerivation rec {
# fix build with gcc9
NIX_CFLAGS_LINK = lib.optional (stdenv.system == "i686-linux") "-lgcc";

# Even when statically linking, libstdc++.la is put in dependency_libs here,
# and hence libstdc++.so passed to the linker, just pass -lstdc++ and let the
# compiler do what it does best. (libaudiofile.la is a generated file, so we
# have to run `make` that far first).
#
# Without this, the executables in this package (sfcommands and examples)
# fail to build: https://github.com/NixOS/nixpkgs/issues/103215
#
# There might be a more sensible way to do this with autotools, but I am not
# smart enough to discover it.
preBuild = lib.optionalString stdenv.targetPlatform.isStatic ''
make -C libaudiofile $makeFlags
sed -i "s/dependency_libs=.*/dependency_libs=' -lstdc++'/" libaudiofile/libaudiofile.la
'';

patches = [
./gcc-6.patch
./CVE-2015-7747.patch