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

Commits on Sep 6, 2019

  1. lilypond: fix segfault 

    When built with GCC>=6.0 current stable lilypond requires
-fno-delete-null-pointer or it may segfault.

Unstable lilypond no longer relies on "this" being allowed to be null, so does
not need this change.

Upstream bug: https://sourceforge.net/p/testlilyissues/issues/4814/

Sample input to reproduce issue:

```
\version "2.18.2"

\new Staff {
    f8( e~ e2.) |
}
```
    @jasom
    jasom committed Sep 6, 2019
    Copy the full SHA
    7b96fdf View commit details

Commits on Sep 7, 2019

  1. Merge pull request #68127 from jasom/lilypond-segfault-fix 

    lilypond: fix segfault
    @ryantm
    ryantm authored Sep 7, 2019
    Copy the full SHA
    6751e49 View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 pkgs/misc/lilypond/default.nix
4 changes: 4 additions & 0 deletions pkgs/misc/lilypond/default.nix
View file
Original file line number Diff line number Diff line change
@@ -31,6 +31,10 @@ stdenv.mkDerivation rec{
sed -re 's%("[$]exe" --version .*)([|\\] *$)%\1 | sed -re "s@/nix/store/[a-z0-9]{32}-@@" \2%' \
-i configure
# This next line disables a GCC optimization and can be removed once 2.19 is stable
# See https://sourceforge.net/p/testlilyissues/issues/4814/ for more details
export CFLAGS="$CFLAGS -fno-delete-null-pointer-checks"
export HOME=$TMPDIR/home
'';