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

Merge pull request #201003 from avdv/fix-bobcat-aarch64-linux

Browse Source 
bobcat: Fix build on aarch64-linux
This commit is contained in:
Robert Scott 2022-11-13 21:51:09 +00:00 committed by GitHub
commit cd5b6f4f91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/bobcat/default.nix
View File

@ -26,6 +26,9 @@ stdenv.mkDerivation rec {
patchShebangs .
'';
# have to link to static gcc lib on aarch64-linux explicitly
NIX_LDFLAGS = lib.optionalString (with stdenv.targetPlatform; isAarch64 && isLinux) "-lgcc";
buildPhase = ''
./build libraries all
./build man

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

@ -18271,7 +18271,11 @@ with pkgs;
else callPackage ../os-specific/linux/bionic-prebuilt { };
bobcat = callPackage ../development/libraries/bobcat { };
bobcat = callPackage ../development/libraries/bobcat
(lib.optionalAttrs (with stdenv.hostPlatform; isAarch64 && isLinux) {
# C++20 is required, aarch64-linux has gcc 9 by default
stdenv = gcc10Stdenv;
});
boehmgc = callPackage ../development/libraries/boehm-gc { };