sile: remove top-level override

This commit is contained in:
Aliaksandr
2026-01-25 11:55:49 -05:00
committed by Michael Daniels
parent fbdf49f097
commit 8aa4d13f10
2 changed files with 6 additions and 10 deletions
+6 -6
View File
@@ -13,7 +13,7 @@
luarocks,
# buildInputs
lua,
luajit,
harfbuzz,
icu,
fontconfig,
@@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
# build time we would fail to build since we only provide it at test time.
"PDFINFO=false"
]
++ lib.optionals (!lua.pkgs.isLuaJIT) [
++ lib.optionals (!luajit.pkgs.isLuaJIT) [
"--without-luajit"
];
@@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
# Use this passthru variable to add packages to your lua environment. Use
# something like this in your development environment:
#
# myLuaEnv = lua.withPackages (
# myLuaEnv = luajit.withPackages (
# ps: lib.attrVals (sile.passthru.luaPackages ++ [
# "lua-cjson"
# "lua-resty-http"
@@ -142,13 +142,13 @@ stdenv.mkDerivation (finalAttrs: {
"ldoc"
# NOTE: Add lua packages here, to change the luaEnv also read by `flake.nix`
]
++ lib.optionals (lib.versionOlder lua.luaversion "5.2") [
++ lib.optionals (lib.versionOlder luajit.luaversion "5.2") [
"bit32"
]
++ lib.optionals (lib.versionOlder lua.luaversion "5.3") [
++ lib.optionals (lib.versionOlder luajit.luaversion "5.3") [
"compat53"
];
luaEnv = lua.withPackages (ps: lib.attrVals finalAttrs.finalPackage.passthru.luaPackages ps);
luaEnv = luajit.withPackages (ps: lib.attrVals finalAttrs.finalPackage.passthru.luaPackages ps);
# Copied from Makefile.am
tests.test = lib.optionalAttrs (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) (
-4
View File
@@ -780,10 +780,6 @@ with pkgs;
propagatedBuildInputs = [ dieHook ];
} ../build-support/setup-hooks/shorten-perl-shebang.sh;
sile = callPackage ../by-name/si/sile/package.nix {
lua = luajit;
};
singularity-tools = callPackage ../build-support/singularity-tools { };
srcOnly = callPackage ../build-support/src-only { };