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

update tufted for nixpkgs fennel changes

Browse source
This commit is contained in:
Daniel Barlow 2023-02-07 23:04:01 +00:00
parent afd9bbbc80
commit 52d8c03ddd
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/tufted/default.nix
View file

@ -1,12 +1,11 @@
{ {
lua5_3 lua5_3
, stdenv , stdenv
, fennel
, fetchFromGitHub , fetchFromGitHub
, makeWrapper , makeWrapper
} : } :
let let
tufty-lua = lua.pkgs.buildLuaPackage { tufty-lua = lua5_3.pkgs.buildLuaPackage {
pname = "tufty"; pname = "tufty";
version = "1"; version = "1";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -22,23 +21,26 @@ let
''; '';
}; };
lua = lua5_3.withPackages (ps: with ps; [ lua = lua5_3.withPackages (ps: with ps; [
tufty-lua luasocket luaposix tufty-lua luasocket luaposix fennel
]); ]);
fennel_ = (fennel.override { inherit lua; });
in stdenv.mkDerivation { in stdenv.mkDerivation {
pname = "tufted"; pname = "tufted";
version = "1"; version = "1";
phases = [ "unpackPhase" "installPhase" ]; phases = [ "unpackPhase" "installPhase" ];
buildInputs = [ lua fennel_ ]; buildInputs = [
lua
];
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
src = ./.; src = ./.;
installPhase = '' installPhase = ''
mkdir -p $out/lib mkdir -p $out/lib
cp tufted.fnl $out/lib cp tufted.fnl $out/lib
makeWrapper ${fennel_}/bin/fennel \ makeWrapper ${lua.pkgs.fennel}/bin/fennel \
$out/bin/tufted \ $out/bin/tufted \
--prefix LUA_CPATH \; "${lua}/lib/lua/5.3/?.so" \
--add-flags "--add-fennel-path $out/lib/?.fnl" \ --add-flags "--add-fennel-path $out/lib/?.fnl" \
--add-flags "--add-package-path $out/lib/?.lua" \ --add-flags "--add-package-path $out/lib/?.lua" \
--add-flags "--add-package-path ${lua}/share/lua/5.3/?.lua\;${lua}/share/lua/5.3/?/init.lua" \
--add-flags "$out/lib/tufted.fnl" --add-flags "$out/lib/tufted.fnl"
''; '';
} }