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

Merge branch 'staging' into staging-next

Browse Source
This commit is contained in:
Jan Tojnar
2019-12-31 03:59:58 +01:00
parent d6136b744a c5406e30b0
commit 0c2adc0fb1
352 changed files with 639 additions and 837 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/virtualization/cri-o/default.nix
+4 -4
View File
@@ -15,7 +15,10 @@
, pkgconfig
}:
buildGoPackage rec {
let
makeFlags = "BUILDTAGS=\"apparmor seccomp selinux
containers_image_ostree_stub\"";
in buildGoPackage rec {
project = "cri-o";
version = "1.16.1";
name = "${project}-${version}${flavor}";
@@ -35,9 +38,6 @@ buildGoPackage rec {
libseccomp libselinux lvm2 ]
++ stdenv.lib.optionals (glibc != null) [ glibc glibc.static ];
makeFlags = ''BUILDTAGS="apparmor seccomp selinux
containers_image_ostree_stub"'';
buildPhase = ''
pushd go/src/${goPackagePath}
pkgs/applications/virtualization/docker/default.nix
+1 -3
View File
@@ -53,9 +53,7 @@ rec {
patchPhase = ''
'';
NIX_CFLAGS_COMPILE = [
"-DMINIMAL=ON"
];
NIX_CFLAGS_COMPILE = "-DMINIMAL=ON";
});
in
stdenv.mkDerivation ((optionalAttrs (stdenv.isLinux) {
pkgs/applications/virtualization/open-vm-tools/default.nix
+1 -1
View File
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = [
NIX_CFLAGS_COMPILE = builtins.toString [
# igrone glib-2.62 deprecations
# Drop in next stable release.
"-DGLIB_DISABLE_DEPRECATION_WARNINGS"
pkgs/applications/virtualization/tini/default.nix
+1 -4
View File
@@ -13,10 +13,7 @@ stdenv.mkDerivation rec {
patchPhase = "sed -i /tini-static/d CMakeLists.txt";
NIX_CFLAGS_COMPILE = [
"-DPR_SET_CHILD_SUBREAPER=36"
"-DPR_GET_CHILD_SUBREAPER=37"
];
NIX_CFLAGS_COMPILE = "-DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37";
buildInputs = [ cmake glibc glibc.static ];
pkgs/applications/virtualization/virtualbox/default.nix
+1 -1
View File
@@ -31,7 +31,7 @@ let
url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
sha256 = "0bqhr3ndchvfhxb31147z8gd81dysyz5dwkvmp56832d0js2564q";
};
NIX_CFLAGS_COMPILE = old.NIX_CFLAGS_COMPILE ++ [ "-Wno-error=stringop-truncation" ];
NIX_CFLAGS_COMPILE = old.NIX_CFLAGS_COMPILE + " -Wno-error=stringop-truncation";
});
in stdenv.mkDerivation {
pname = "virtualbox";
pkgs/applications/virtualization/xen/4.10.nix
+1 -1
View File
@@ -148,7 +148,7 @@ callPackage (import ./generic.nix (rec {
++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd"
++ optional (withInternalOVMF) "--enable-ovmf";
NIX_CFLAGS_COMPILE = [
NIX_CFLAGS_COMPILE = toString [
# Fix build on Glibc 2.24.
"-Wno-error=deprecated-declarations"
# Fix build with GCC 8
pkgs/applications/virtualization/xen/4.8.nix
+1 -1
View File
@@ -167,7 +167,7 @@ callPackage (import ./generic.nix (rec {
xenpmdpatch
];
NIX_CFLAGS_COMPILE = [
NIX_CFLAGS_COMPILE = toString [
# Fix build on Glibc 2.24
"-Wno-error=deprecated-declarations"
# Fix build with GCC8