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

audacity: fixup build also with default gcc

Browse Source 
and enableParallelBuilding.
This commit is contained in:
Vladimír Čunát 2017-02-04 20:46:49 +01:00
parent a558519a55
commit d2a571aacd
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/audio/audacity/default.nix
View File

@ -20,12 +20,13 @@ stdenv.mkDerivation rec {
+ "/audacity-ffmpeg.patch?h=packages/audacity&id=0c1e35798d4d70692";
sha256 = "19fr674mw844zmkp1476yigkcnmb6zyn78av64ccdwi3p68i00rf";
})
(fetchpatch {
name = "gcc6.patch";
url = "https://github.com/audacity/audacity/commit/60f2322055756e8cacfe96530a12c63e9694482c.patch";
sha256 = "07jlxr8y7ap3nsblx3zh8v9rcx7ajbcfnvwzhwykmbwbsyirgqf2";
})
];
]
++ optional (hasPrefix "gcc-6" stdenv.cc.cc.name)
(fetchpatch {
name = "gcc6.patch";
url = "https://github.com/audacity/audacity/commit/60f2322055756e8cacfe96530a12c63e9694482c.patch";
sha256 = "07jlxr8y7ap3nsblx3zh8v9rcx7ajbcfnvwzhwykmbwbsyirgqf2";
});
preConfigure = /* we prefer system-wide libs */ ''
mv lib-src lib-src-rm
@ -64,6 +65,8 @@ stdenv.mkDerivation rec {
ffmpeg libmad lame libvorbis flac soundtouch
]; #ToDo: detach sbsms
enableParallelBuilding = true;
dontDisableStatic = true;
doCheck = false; # Test fails