openvi: 7.6.31 -> 7.7.32 (#461594)
This commit is contained in:
@@ -2,24 +2,29 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
ncurses,
|
||||
perl,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "openvi";
|
||||
version = "7.6.31";
|
||||
version = "7.7.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "johnsonjh";
|
||||
repo = "OpenVi";
|
||||
rev = version;
|
||||
hash = "sha256-RqmulYHQFZmTHQAYgZmB8tAG6mSquNODmssfKB8YqDU=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-kLULaKEefMpNLANnVdWAZeH+2KY5gEWGce6vJ/R7HAI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
ncurses
|
||||
perl
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
ncurses
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
@@ -30,6 +35,12 @@ stdenv.mkDerivation rec {
|
||||
"IUSGR=$(USER)"
|
||||
];
|
||||
|
||||
# Don't include ncurses header, but link against ncurses
|
||||
# openvi requires GNU ncurses symbols, but ncurses headers
|
||||
# is incompatible with macOS wchar.h, resulting in
|
||||
# "error: expected function body after function declarator"
|
||||
env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-L${lib.getLib ncurses}/lib -lncursesw";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
@@ -40,4 +51,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with lib.maintainers; [ aleksana ];
|
||||
mainProgram = "ovi";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user