cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

mle: 1.4.3 -> 1.5.0

Browse source
This commit is contained in:
Adam Saponara 2022-05-29 13:00:49 -04:00
parent 19e8b063a9
commit c5edc1d38a
1 changed files with 35 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
pkgs/applications/editors/mle/default.nix
View file

@ -1,26 +1,53 @@
{ lib, stdenv, fetchFromGitHub, termbox, pcre, uthash, lua5_3, makeWrapper, installShellFiles }: { lib
, stdenv
, fetchFromGitHub
, fetchpatch
, pcre
, uthash
, lua5_4
, makeWrapper
, installShellFiles
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mle"; pname = "mle";
version = "1.4.3"; version = "1.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "adsr"; owner = "adsr";
repo = "mle"; repo = "mle";
rev = "v${version}"; rev = "v${version}";
sha256 = "16dbwfdd6sqqn7jfaxd5wdy8y9ghbihnz6bgn3xhqcww8rj1sia1"; sha256 = "1nhd00lsx9v12zdmps92magz76c2d8zzln3lxvzl4ng73gbvq3n0";
}; };
# Fix location of Lua 5.3 header and library # Bug fixes found after v1.5.0 release
patches = [
(fetchpatch {
name = "skip_locale_dep_test.patch";
url = "https://github.com/adsr/mle/commit/e4dc4314b02a324701d9ae9873461d34cce041e5.patch";
sha256 = "sha256-j3Z/n+2LqB9vEkWzvRVSOrF6yE+hk6f0dvEsTQ74erw=";
})
(fetchpatch {
name = "fix_input_trail.patch";
url = "https://github.com/adsr/mle/commit/bc05ec0eee4143d824010c6688fce526550ed508.patch";
sha256 = "sha256-dM63EBDQfHLAqGZk3C5NtNAv23nCTxXVW8XpLkAeEyQ=";
})
];
# Fix location of Lua 5.4 header and library
postPatch = '' postPatch = ''
substituteInPlace Makefile --replace "-llua5.3" "-llua"; substituteInPlace Makefile --replace "-llua5.4" "-llua";
substituteInPlace mle.h --replace "<lua5.3/" "<"; substituteInPlace mle.h --replace "<lua5.4/" "<";
patchShebangs tests/* patchShebangs tests/*
''; '';
# Use select(2) instead of poll(2) (poll is returning POLLINVAL on macOS)
# Enable compiler optimization
CFLAGS = "-DTB_OPT_SELECT -O2";
nativeBuildInputs = [ makeWrapper installShellFiles ]; nativeBuildInputs = [ makeWrapper installShellFiles ];
buildInputs = [ termbox pcre uthash lua5_3 ]; buildInputs = [ pcre uthash lua5_4 ];
doCheck = true; doCheck = true;
@ -30,13 +57,8 @@ stdenv.mkDerivation rec {
installManPage mle.1 installManPage mle.1
''; '';
postFixup = lib.optionalString stdenv.isDarwin ''
wrapProgram $out/bin/mle --prefix DYLD_LIBRARY_PATH : ${termbox}/lib
'';
meta = with lib; { meta = with lib; {
broken = (stdenv.isLinux && stdenv.isAarch64); description = "Small, flexible, terminal-based text editor";
description = "Small, flexible terminal-based text editor";
homepage = "https://github.com/adsr/mle"; homepage = "https://github.com/adsr/mle";
license = licenses.asl20; license = licenses.asl20;
platforms = platforms.unix; platforms = platforms.unix;