From a172180be8ccb836ab9f79f2c13c69b5aa26fd84 Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Fri, 24 Mar 2023 23:43:13 +0000 Subject: [PATCH] don't set lua5_3 in overlay sphinx depends on lua5_3, so overriding it globally means rebuilding that - which isn't really necessary --- overlay.nix | 4 ++-- pkgs/ifwait/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/overlay.nix b/overlay.nix index ee90c202..9269dd76 100644 --- a/overlay.nix +++ b/overlay.nix @@ -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 { diff --git a/pkgs/ifwait/default.nix b/pkgs/ifwait/default.nix index bc21ef4a..0f1b2dbb 100644 --- a/pkgs/ifwait/default.nix +++ b/pkgs/ifwait/default.nix @@ -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 {