summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorRobert Scott <code@humanleg.org.uk>2022-11-13 21:51:09 +0000
committerGitHub <noreply@github.com>2022-11-13 21:51:09 +0000
commitcd5b6f4f91fe7f03130df63f5040e7740a694843 (patch)
treebafc1487dfab03086bb936ed8f4d94d01bac5b97 /pkgs/top-level
parenta715b68d99c8a3bcc425a203c0fd519796309291 (diff)
parentf933aea9e194bca9f63e36cae699634b4d90b28c (diff)
Merge pull request #201003 from avdv/fix-bobcat-aarch64-linux
bobcat: Fix build on aarch64-linux
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e6c0ee91cfe3..663ca8fd4ea7a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 { };