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

helm: compile with gcc9 (#95862)

Browse Source 
To make using MESA libraries that are compiled with gcc9 work,
refs #95806
This commit is contained in:
Arnout Engelen 2020-08-25 20:26:10 +02:00 committed by GitHub
parent 90db9641cb
commit 28945790d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/applications/audio/helm/default.nix
View File

@ -1,5 +1,16 @@
{ stdenv, fetchFromGitHub , xorg, freetype, alsaLib, curl, libjack2 { stdenv
, lv2, pkgconfig, libGLU, libGL }: , fetchFromGitHub
, fetchpatch
, xorg
, freetype
, alsaLib
, curl
, libjack2
, lv2
, pkgconfig
, libGLU
, libGL
}:
stdenv.mkDerivation { stdenv.mkDerivation {
version = "0.9.0"; version = "0.9.0";
@ -20,7 +31,15 @@
CXXFLAGS = "-DHAVE_LROUND"; 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 sed -i 's|usr/||g' Makefile
''; '';

4
pkgs/top-level/all-packages.nix
View File

@ -26493,9 +26493,7 @@ in
hatari = callPackage ../misc/emulators/hatari { }; hatari = callPackage ../misc/emulators/hatari { };
helm = callPackage ../applications/audio/helm { helm = callPackage ../applications/audio/helm { };
stdenv = gcc8Stdenv;
};
helmfile = callPackage ../applications/networking/cluster/helmfile { }; helmfile = callPackage ../applications/networking/cluster/helmfile { };