ehmry/sigil
ehmry
/
sigil
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

overlay: do not override LLVM for non-Genode

This commit is contained in:
Ehmry - 2021-04-15 09:31:33 +02:00
parent 85a91fcaa2
commit 268fab7808
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
overlay/default.nix
View File

@ -158,9 +158,9 @@ in nullPkgs // {
} else } else
linuxPackages; linuxPackages;
llvmPackages_11 = llvmPackages_11 = if targetPlatform.isGenode then
# A copy of the LLVM expressions from Nixpkgs. # A copy of the LLVM expressions from Nixpkgs.
# Nothing here is upstreamed. # Nothing here is upstreamed.
callPackage ./llvm-11 ({ callPackage ./llvm-11 ({
inherit (stdenvAdapters) overrideCC; inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_11.tools; buildLlvmTools = buildPackages.llvmPackages_11.tools;
@ -168,7 +168,9 @@ in nullPkgs // {
} // lib.optionalAttrs } // lib.optionalAttrs
(stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) {
stdenv = gcc7Stdenv; stdenv = gcc7Stdenv;
}); })
else
prev.llvmPackages_11;
ncurses = ncurses =
# https://invisible-island.net/autoconf/ # https://invisible-island.net/autoconf/