nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 08:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #327467 from t4ccer/t4/non/fix-waf

Browse Source
This commit is contained in:
Marcus Ramberg 2024-07-20 09:03:26 +03:00 committed by GitHub
commit 333e5ec8ec
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/audio/non/default.nix
View File

@ -17,6 +17,13 @@ stdenv.mkDerivation {
ladspaH liblo libsigcxx lrdf
];
# NOTE: non provides its own waf script that is incompatible with new
# python versions. If the script is not present, wafHook will install
# a compatible version from nixpkgs.
prePatch = ''
rm waf
'';
env.CXXFLAGS = "-std=c++14";
meta = {

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

@ -23249,7 +23249,9 @@ with pkgs;
nntp-proxy = callPackage ../applications/networking/nntp-proxy { };
non = callPackage ../applications/audio/non { };
non = callPackage ../applications/audio/non {
wafHook = (waf.override { extraTools = [ "gccdeps" ]; }).hook;
};
ntl = callPackage ../development/libraries/ntl { };