From 66fb236fabd92e463fc24744058da81790f76ba6 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 9 Jul 2023 19:32:28 -0300 Subject: [PATCH] jove: 4.17.4.9 -> 4.17.5.3 --- pkgs/applications/editors/jove/default.nix | 23 +++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/jove/default.nix b/pkgs/applications/editors/jove/default.nix index fc8026fb5caf..82c3f9056d35 100644 --- a/pkgs/applications/editors/jove/default.nix +++ b/pkgs/applications/editors/jove/default.nix @@ -4,17 +4,18 @@ , groff , makeWrapper , ncurses +, runtimeShell }: stdenv.mkDerivation (finalAttrs: { pname = "jove"; - version = "4.17.4.9"; + version = "4.17.5.3"; src = fetchFromGitHub { owner = "jonmacs"; repo = "jove"; rev = finalAttrs.version; - sha256 = "sha256-Lo5S3t4vewkpoihVdxa3yRrEzNWeNLHCZHXiLCxOH5o="; + hash = "sha256-ZBq2zCml637p9VgedpOrUn2jSc5L0pthdgRS7YsB3zs="; }; nativeBuildInputs = [ makeWrapper ]; @@ -24,11 +25,19 @@ stdenv.mkDerivation (finalAttrs: { ncurses ]; + postPatch = '' + patchShebangs testbuild.sh testmailer.sh teachjove jmake.sh + ''; + dontConfigure = true; preBuild = '' makeFlagsArray+=(SYSDEFS="-DSYSVR4 -D_XOPEN_SOURCE=500" \ - TERMCAPLIB=-lncurses JOVEHOME=${placeholder "out"}) + JTMPDIR=$TMPDIR + TERMCAPLIB=-lncurses \ + SHELL=${runtimeShell} \ + DFLTSHELL=${runtimeShell} \ + JOVEHOME=${placeholder "out"}) ''; postInstall = '' @@ -36,13 +45,13 @@ stdenv.mkDerivation (finalAttrs: { --prefix PATH ":" "$out/bin" ''; - meta = with lib; { + meta = { homepage = "https://github.com/jonmacs/jove"; description = "Jonathan's Own Version of Emacs"; changelog = "https://github.com/jonmacs/jove/releases/tag/${finalAttrs.version}"; - license = licenses.bsd2; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; # never built on Hydra: https://hydra.nixos.org/job/nixpkgs/trunk/jove.x86_64-darwin broken = stdenv.isDarwin; };