public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #111886 from saschagrunert/runc 

runc: 1.0.0-rc92 -> 1.0.0-rc93
This commit is contained in:
adisbladis 2021-02-04 11:01:49 +01:00 committed by GitHub
parent c7d8cb46af c1b7380700
commit b461153800
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/virtualization/runc/default.nix
View File

@ -16,13 +16,13 @@
buildGoPackage rec { buildGoPackage rec {
pname = "runc"; pname = "runc";
version = "1.0.0-rc92"; version = "1.0.0-rc93";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "opencontainers"; owner = "opencontainers";
repo = "runc"; repo = "runc";
rev = "v${version}"; rev = "v${version}";
sha256 = "0r4zbxbs03xr639r7848282j1ybhibfdhnxyap9p76j5w8ixms94"; sha256 = "008d5wkznic80n5q1vwx727qn5ifalc7cydq68hc1gk9wrhna4v4";
}; };
goPackagePath = "github.com/opencontainers/runc"; goPackagePath = "github.com/opencontainers/runc";
@ -30,15 +30,13 @@ buildGoPackage rec {
nativeBuildInputs = [ go-md2man installShellFiles makeWrapper pkg-config which ]; nativeBuildInputs = [ go-md2man installShellFiles makeWrapper pkg-config which ];
buildInputs = [ libselinux libseccomp libapparmor apparmor-parser ]; buildInputs = [ libselinux libseccomp libapparmor ];
makeFlags = [ "BUILDTAGS+=seccomp" "BUILDTAGS+=apparmor" "BUILDTAGS+=selinux" ]; makeFlags = [ "BUILDTAGS+=seccomp" ];
buildPhase = '' buildPhase = ''
cd go/src/${goPackagePath} cd go/src/${goPackagePath}
patchShebangs . patchShebangs .
substituteInPlace libcontainer/apparmor/apparmor.go \
--replace /sbin/apparmor_parser ${apparmor-parser}/bin/apparmor_parser
make ${toString makeFlags} runc man make ${toString makeFlags} runc man
''; '';