dan/liminix
1
0
Fork 5
Code

don't set lua5_3 in overlay

Browse Source 
sphinx depends on lua5_3, so overriding it globally means rebuilding
that - which isn't really necessary
This commit is contained in:
Daniel Barlow 2023-03-24 23:43:13 +00:00
parent 608d750b60
commit a172180be8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
overlay.nix
View File

@ -2,7 +2,7 @@ final: prev:
let
extraPkgs = import ./pkgs/default.nix { inherit (final) callPackage; };
inherit (final) fetchpatch;
lua = prev.lua5_3.overrideAttrs(o: {
lua_no_readline = prev.lua5_3.overrideAttrs(o: {
name = "lua-tty";
preBuild = ''
makeFlagsArray+=(PLAT="posix" SYSLIBS="-Wl,-E -ldl" CFLAGS="-O2 -fPIC -DLUA_USE_POSIX -DLUA_USE_DLOPEN")
@ -34,7 +34,7 @@ extraPkgs // {
];
});
lua5_3 = let s = lua.override { self = s; }; in s;
luaSmall = let s = lua_no_readline.override { self = s; }; in s;
s6 = prev.s6.overrideAttrs(o:
let patch = fetchpatch {

4
pkgs/ifwait/default.nix
View File

@ -1,11 +1,11 @@
{
lua5_3
luaSmall
, netlink-lua
, stdenv
, makeWrapper
}:
let
lua = lua5_3;
lua = luaSmall;
netlink = netlink-lua.override {inherit lua;};
fennel = lua.pkgs.fennel;
in stdenv.mkDerivation rec {