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

Merge pull request #113091 from adisbladis/criu-aarch64

Browse Source 
criu: Fix build on aarch64
This commit is contained in:
adisbladis 2021-02-14 09:02:34 +01:00 committed by GitHub
commit 9fc0fa97cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/criu/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, protobuf, protobufc, asciidoc, iptables { stdenv, lib, fetchurl, protobuf, protobufc, asciidoc, iptables
, xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkg-config , xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkg-config
, which, python3, makeWrapper, docbook_xml_dtd_45 }: , which, python3, makeWrapper, docbook_xml_dtd_45, perl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "criu"; pname = "criu";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ pkg-config docbook_xsl which makeWrapper docbook_xml_dtd_45 python3 python3.pkgs.wrapPython ]; nativeBuildInputs = [ pkg-config docbook_xsl which makeWrapper docbook_xml_dtd_45 python3 python3.pkgs.wrapPython perl ];
buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet iptables ]; buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet iptables ];
propagatedBuildInputs = with python3.pkgs; [ python python3.pkgs.protobuf ]; propagatedBuildInputs = with python3.pkgs; [ python python3.pkgs.protobuf ];
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
description = "Userspace checkpoint/restore for Linux"; description = "Userspace checkpoint/restore for Linux";
homepage = "https://criu.org"; homepage = "https://criu.org";
license = licenses.gpl2; license = licenses.gpl2;
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" "aarch64-linux" ];
maintainers = [ maintainers.thoughtpolice ]; maintainers = [ maintainers.thoughtpolice ];
}; };
} }