Skip to content

Commit edd38b1

Browse files
authored
limine: 8.7.0 -> 9.0.0 and few other changes (#384280)
2 parents c309559 + bd736df commit edd38b1

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

pkgs/by-name/li/limine/package.nix

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
fetchurl,
44
lib,
5-
llvmPackages_18,
5+
llvmPackages,
66
mtools,
77
nasm,
88
# The following options map to configure flags.
@@ -15,10 +15,9 @@
1515
}:
1616

1717
let
18-
llvmPackages = llvmPackages_18;
1918
stdenv = llvmPackages.stdenv;
2019

21-
version = "8.7.0";
20+
version = "9.0.0";
2221

2322
hasI686 =
2423
(if targets == [ ] then stdenv.hostPlatform.isx86_32 else (builtins.elem "i686" targets))
@@ -56,9 +55,9 @@ let
5655
];
5756
in
5857

59-
assert lib.assertMsg (!(biosSupport && !hasI686)) "BIOS builds are possible only for x86";
58+
assert lib.assertMsg (!biosSupport || hasI686) "BIOS builds are possible only for x86";
6059

61-
assert lib.assertMsg (!(pxeSupport && !hasI686)) "PXE builds are possible only for x86";
60+
assert lib.assertMsg (!pxeSupport || hasI686) "PXE builds are possible only for x86";
6261

6362
# The output of the derivation is a tool to create bootable images using Limine
6463
# as bootloader for various platforms and corresponding binary and helper files.
@@ -70,14 +69,9 @@ stdenv.mkDerivation {
7069
# Packaging that in Nix is very cumbersome.
7170
src = fetchurl {
7271
url = "https://github.com/limine-bootloader/limine/releases/download/v${version}/limine-${version}.tar.gz";
73-
hash = "sha256-pwoR9ptMpdhdEe/Kbyc+smv9oNIqtJ9L0KFdf6/g0Ec=";
72+
hash = "sha256-jTApAnysHola1RX7zk2CLoEbNpS8r+O9qP1zJjxZ7Ho=";
7473
};
7574

76-
hardeningDisable = [
77-
# clang doesn't support this for RISC-V target
78-
"zerocallusedregs"
79-
];
80-
8175
enableParallelBuilding = true;
8276

8377
nativeBuildInputs =

0 commit comments

Comments
 (0)