lbailly/liminix
1
0
Fork 0
forked from DGNum/liminix
Code Pull requests 2 Activity Actions

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 let
extraPkgs = import ./pkgs/default.nix { inherit (final) callPackage; }; extraPkgs = import ./pkgs/default.nix { inherit (final) callPackage; };
inherit (final) fetchpatch; inherit (final) fetchpatch;
lua = prev.lua5_3.overrideAttrs(o: { lua_no_readline = prev.lua5_3.overrideAttrs(o: {
name = "lua-tty"; name = "lua-tty";
preBuild = '' preBuild = ''
makeFlagsArray+=(PLAT="posix" SYSLIBS="-Wl,-E -ldl" CFLAGS="-O2 -fPIC -DLUA_USE_POSIX -DLUA_USE_DLOPEN") 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: s6 = prev.s6.overrideAttrs(o:
let patch = fetchpatch { let patch = fetchpatch {

4
pkgs/ifwait/default.nix
View file

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