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

Merge pull request #278264 from trofi/binaryen-fix-for-gcc-13

Browse Source 
binaryen: fix the build
This commit is contained in:
Weijia Wang 2024-01-03 05:31:46 +01:00 committed by GitHub
commit 5d99c78554
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/compilers/binaryen/default.nix
View File

@ -20,6 +20,13 @@ stdenv.mkDerivation rec {
url = "https://github.com/WebAssembly/binaryen/commit/889422e0c92552ff484659f9b41e777ba7ab35c1.patch";
hash = "sha256-acM8mytL9nhm4np9tpUbd1X0wJ7y308HV2fvgcAW1lY=";
})
# Fix fmin tests on gcc-13: https://github.com/WebAssembly/binaryen/pull/5994
(fetchpatch {
name = "gcc-13.patch";
url = "https://github.com/WebAssembly/binaryen/commit/1e17dfb695a19d5d41f1f88411fbcbc5f2408c8f.patch";
hash = "sha256-5JZh15CXkg5XdTG8eRJXPwO+zmymYeFjKbHutRPTmlU=";
})
];
nativeBuildInputs = [ cmake python3 ];

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

@ -15573,10 +15573,10 @@ with pkgs;
bigloo = callPackage ../development/compilers/bigloo { };
binaryen = pin-to-gcc12-if-gcc13 (callPackage ../development/compilers/binaryen {
binaryen = callPackage ../development/compilers/binaryen {
nodejs = nodejs-slim;
inherit (python3Packages) filecheck;
});
};
blueprint-compiler = callPackage ../development/compilers/blueprint { };