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

Merge gcc-9 into staging (#68029)

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-12-30 16:38:38 +01:00
parent bfa5af85b7 59ab29fe88
commit 6d059becd3
122 changed files with 831 additions and 1873 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/virtualization/open-vm-tools/default.nix
+9 -3
View File
@@ -46,9 +46,15 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
# igrone glib-2.62 deprecations
# Drop in next stable release.
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
NIX_CFLAGS_COMPILE = [
# igrone glib-2.62 deprecations
# Drop in next stable release.
"-DGLIB_DISABLE_DEPRECATION_WARNINGS"
# fix build with gcc9
"-Wno-error=address-of-packed-member"
"-Wno-error=format-overflow"
];
postInstall = ''
wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \
pkgs/applications/virtualization/spice-vdagent/default.nix
+5 -4
View File
@@ -1,17 +1,18 @@
{stdenv, fetchurl, pkgconfig, alsaLib, spice-protocol, glib,
libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus,
libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus, libdrm,
systemd}:
stdenv.mkDerivation rec {
name = "spice-vdagent-0.18.0";
name = "spice-vdagent-0.19.0";
src = fetchurl {
url = "https://www.spice-space.org/download/releases/${name}.tar.bz2";
sha256 = "1bmyvapwj1x0m6y8q0r1df2q37vsnb04qkgnnrfbnzf1qzipxvl0";
sha256 = "0r9gjx1vcgb4f7g85b1ib045kqa3dqjk12m7342i5y443ihpr9v3";
};
NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ];
postPatch = ''
substituteInPlace data/spice-vdagent.desktop --replace /usr $out
'';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ alsaLib spice-protocol glib
buildInputs = [ alsaLib spice-protocol glib libdrm
libpciaccess libxcb libXrandr libXinerama libXfixes
dbus systemd ] ;
meta = {
pkgs/applications/virtualization/virtualbox/default.nix
+11 -1
View File
@@ -23,6 +23,16 @@ let
# guest-additions/default.nix as well.
main = "036x2mvkk22lbg72cz6pik9z538j1ag6mmwjjmfikgrq1i7v24jy";
version = "6.0.14";
iasl' = iasl.overrideAttrs (old: rec {
inherit (old) pname;
version = "20190108";
src = fetchurl {
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" ];
});
in stdenv.mkDerivation {
pname = "virtualbox";
inherit version;
@@ -41,7 +51,7 @@ in stdenv.mkDerivation {
dontWrapQtApps = true;
buildInputs =
[ iasl dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL
[ iasl' dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL
libcap glib lvm2 alsaLib curl libvpx pam makeself perl
libXmu libpng libopus python ]
++ optional javaBindings jdk
pkgs/applications/virtualization/xen/4.10.nix
+4
View File
@@ -156,6 +156,10 @@ callPackage (import ./generic.nix (rec {
"-Wno-error=stringop-truncation"
"-Wno-error=format-truncation"
"-Wno-error=array-bounds"
# Fix build with GCC 9
"-Wno-error=address-of-packed-member"
"-Wno-error=format-overflow"
"-Wno-error=absolute-value"
];
postPatch = ''
pkgs/applications/virtualization/xen/4.8.nix
+4
View File
@@ -175,6 +175,10 @@ callPackage (import ./generic.nix (rec {
"-Wno-error=stringop-truncation"
"-Wno-error=format-truncation"
"-Wno-error=array-bounds"
# Fix build with GCC9
"-Wno-error=address-of-packed-member"
"-Wno-error=format-overflow"
"-Wno-error=absolute-value"
];
postPatch = ''