diff options
| author | Arnout Engelen <arnout@bzzt.net> | 2020-08-25 20:26:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-25 20:26:10 +0200 |
| commit | 28945790d05bf78ae7979d68736b657736d9370e (patch) | |
| tree | c49bea8a67bddc83f7e85a899a5257c335f0ab22 | |
| parent | 90db9641cb072c48e2558a592b3c74f912213a8e (diff) | |
helm: compile with gcc9 (#95862)
To make using MESA libraries that are compiled with gcc9 work, refs #95806
| -rw-r--r-- | pkgs/applications/audio/helm/default.nix | 25 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 23 insertions, 6 deletions
diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix index 8459967a363c5..145ba68b08b1c 100644 --- a/pkgs/applications/audio/helm/default.nix +++ b/pkgs/applications/audio/helm/default.nix @@ -1,5 +1,16 @@ -{ stdenv, fetchFromGitHub , xorg, freetype, alsaLib, curl, libjack2 -, lv2, pkgconfig, libGLU, libGL }: +{ stdenv +, fetchFromGitHub +, fetchpatch +, xorg +, freetype +, alsaLib +, curl +, libjack2 +, lv2 +, pkgconfig +, libGLU +, libGL +}: stdenv.mkDerivation { version = "0.9.0"; @@ -20,7 +31,15 @@ CXXFLAGS = "-DHAVE_LROUND"; - patchPhase = '' + patches = [ + # gcc9 compatibility https://github.com/mtytel/helm/pull/233 + (fetchpatch { + url = "https://github.com/mtytel/helm/commit/cb611a80bd5a36d31bfc31212ebbf79aa86c6f08.patch"; + sha256 = "1i2289srcfz17c3zzab6f51aznzdj62kk53l4afr32bkjh9s4ixk"; + }) + ]; + + prePatch = '' sed -i 's|usr/||g' Makefile ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da8cc3b2dd42c..0ee91ac59ab36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26493,9 +26493,7 @@ in hatari = callPackage ../misc/emulators/hatari { }; - helm = callPackage ../applications/audio/helm { - stdenv = gcc8Stdenv; - }; + helm = callPackage ../applications/audio/helm { }; helmfile = callPackage ../applications/networking/cluster/helmfile { }; |