diff options
| author | Maxine Aubrey <maxeaubrey@gmail.com> | 2021-05-08 13:08:59 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-05-13 16:40:07 +0000 |
| commit | f2c51f546b390e5e0528ec2e2b88cbbeb46ae1ff (patch) | |
| tree | 7e01b7fa444fe4bdcfb73572e3ff210fd7a4170b /pkgs/applications/virtualization/open-vm-tools/default.nix | |
| parent | ef2742bcde6e4fb2c6641c3b088598de21bbd42d (diff) | |
| download | nixpkgs-f2c51f546b390e5e0528ec2e2b88cbbeb46ae1ff.tar nixpkgs-f2c51f546b390e5e0528ec2e2b88cbbeb46ae1ff.tar.gz nixpkgs-f2c51f546b390e5e0528ec2e2b88cbbeb46ae1ff.tar.bz2 nixpkgs-f2c51f546b390e5e0528ec2e2b88cbbeb46ae1ff.tar.lz nixpkgs-f2c51f546b390e5e0528ec2e2b88cbbeb46ae1ff.tar.xz nixpkgs-f2c51f546b390e5e0528ec2e2b88cbbeb46ae1ff.tar.zst nixpkgs-f2c51f546b390e5e0528ec2e2b88cbbeb46ae1ff.zip | |
open-vm-tools: fix building with glib 2.68
Diffstat (limited to 'pkgs/applications/virtualization/open-vm-tools/default.nix')
| -rw-r--r-- | pkgs/applications/virtualization/open-vm-tools/default.nix | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index bc66791ad36..e7479957444 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook, +{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook, fetchpatch, fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto, libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst, pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which, @@ -23,6 +23,18 @@ stdenv.mkDerivation rec { buildInputs = [ fuse glib icu libdnet libmspack libtirpc openssl pam procps rpcsvc-proto xercesc ] ++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; + patches = [ + # Fix building with glib 2.68. Remove after next release. + # We drop AUTHORS due to conflicts when applying. + # https://github.com/vmware/open-vm-tools/pull/505 + (fetchpatch { + url = "https://github.com/vmware/open-vm-tools/commit/82931a1bcb39d5132910c7fb2ddc086c51d06662.patch"; + stripLen = 1; + excludes = [ "AUTHORS" ]; + sha256 = "0yz5hnngr5vd4416hvmh8734a9vxa18d2xd37kl7if0p9vik6zlg"; + }) + ]; + postPatch = '' # Build bugfix for 10.1.0, stolen from Arch PKGBUILD mkdir -p common-agent/etc/config |