nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 17:03:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

nsjail: 3.0 -> 3.1

Browse Source
This commit is contained in:
Nick Cao 2022-09-16 17:39:20 +08:00
parent 8051e9c4ae
commit 0016b76745
No known key found for this signature in database
2 changed files with 6 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/tools/security/nsjail/001-fix-bison-link-error.patch
View File

@ -1,30 +0,0 @@
From 8e309a0af0851ab54ca7c6d51b6f3d19ee42c8ee Mon Sep 17 00:00:00 2001
From: Evangelos Foutras <evangelos@foutrelis.com>
Date: Wed, 17 Mar 2021 16:36:40 +0200
Subject: [PATCH] Replace YYUSE call with void cast in src/parser.y
The YYUSE macro was renamed to YY_USE in bison 3.7.5; we might as well
avoid using it altogether and cast the unused variable to void instead.
Fixes the following linker error:
/usr/bin/ld: kafel/libkafel.a(libkafel.o): in function `kafel_yyerror':
arm_syscalls.c:(.text+0x6984): undefined reference to `YYUSE'
---
src/parser.y | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/parser.y b/src/parser.y
index e0f109c..0e01373 100644
--- a/kafel/src/parser.y
+++ b/kafel/src/parser.y
@@ -420,8 +420,8 @@ const_def
void yyerror(YYLTYPE * loc, struct kafel_ctxt* ctxt, yyscan_t scanner,
const char *msg) {
+ (void)scanner; /* suppress unused-parameter warning */
if (!ctxt->lexical_error) {
- YYUSE(scanner);
if (loc->filename != NULL) {
append_error(ctxt, "%s:%d:%d: %s", loc->filename, loc->first_line, loc->first_column, msg);
} else {

18
pkgs/tools/security/nsjail/default.nix
View File

@ -1,36 +1,30 @@
{ lib, stdenv, fetchFromGitHub, autoconf, bison, flex, libtool, pkg-config, which
, libnl, protobuf, protobufc, shadow
, libnl, protobuf, protobufc, shadow, installShellFiles
}:
stdenv.mkDerivation rec {
pname = "nsjail";
version = "3.0"; # Bumping? Remove the bison patch.
version = "3.1";
src = fetchFromGitHub {
owner = "google";
repo = "nsjail";
rev = version;
fetchSubmodules = true;
sha256 = "1w6x8xcrs0i1y3q41gyq8z3cq9x24qablklc4jiydf855lhqn4dh";
sha256 = "sha256-ICJpD7iCT7tLRX+52XvayOUuO1g0L0jQgk60S2zLz6c=";
};
nativeBuildInputs = [ autoconf bison flex libtool pkg-config which ];
nativeBuildInputs = [ autoconf bison flex libtool pkg-config which installShellFiles ];
buildInputs = [ libnl protobuf protobufc ];
enableParallelBuilding = true;
patches = [
# To remove after bumping 3.0
./001-fix-bison-link-error.patch
];
preBuild = ''
makeFlagsArray+=(USER_DEFINES='-DNEWUIDMAP_PATH=${shadow}/bin/newuidmap -DNEWGIDMAP_PATH=${shadow}/bin/newgidmap')
'';
installPhase = ''
mkdir -p $out/bin $out/share/man/man1
install nsjail $out/bin/
install nsjail.1 $out/share/man/man1/
install -Dm755 nsjail "$out/bin/nsjail"
installManPage nsjail.1
'';
meta = with lib; {