From 268fab78086bc230606577670cfc6298323a44f7 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 15 Apr 2021 09:31:33 +0200 Subject: [PATCH] overlay: do not override LLVM for non-Genode --- overlay/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/overlay/default.nix b/overlay/default.nix index fc3a0a8..9f5250e 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -158,9 +158,9 @@ in nullPkgs // { } else linuxPackages; - llvmPackages_11 = - # A copy of the LLVM expressions from Nixpkgs. - # Nothing here is upstreamed. + llvmPackages_11 = if targetPlatform.isGenode then + # A copy of the LLVM expressions from Nixpkgs. + # Nothing here is upstreamed. callPackage ./llvm-11 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_11.tools; @@ -168,7 +168,9 @@ in nullPkgs // { } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { stdenv = gcc7Stdenv; - }); + }) + else + prev.llvmPackages_11; ncurses = # https://invisible-island.net/autoconf/