diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/applications/virtualization/open-vm-tools')
3 files changed, 4 insertions, 54 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix index df9a89293f2c..4cdce2172a21 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,18 +1,18 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook, - fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, + fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto, libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst, pkgconfig, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute, dbus, systemd, which, withX ? true }: stdenv.mkDerivation rec { pname = "open-vm-tools"; - version = "11.1.0"; + version = "11.2.0"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${version}"; - sha256 = "1wyiz8j5b22ajrr1fh9cn55lsgd5g13q0i8wvk2a0yw0vaw1883s"; + sha256 = "125y3zdhj353dmmjmssdaib2zp1jg5aiqmvpgkrzhnh5nx2icfv6"; }; sourceRoot = "${src.name}/open-vm-tools"; @@ -20,14 +20,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; - buildInputs = [ fuse glib icu libdnet libmspack openssl pam procps xercesc ] + 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 = [ - ./recognize_nixos.patch - ./find_gdk_pixbuf_xlib.patch #See https://github.com/vmware/open-vm-tools/pull/438 - ]; - postPatch = '' # Build bugfix for 10.1.0, stolen from Arch PKGBUILD mkdir -p common-agent/etc/config diff --git a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/open-vm-tools/find_gdk_pixbuf_xlib.patch b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/open-vm-tools/find_gdk_pixbuf_xlib.patch deleted file mode 100644 index 6606c50e77d9..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/open-vm-tools/find_gdk_pixbuf_xlib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/lib/appUtil/Makefile.am b/lib/appUtil/Makefile.am -index a0d8e391..899cd4e9 100644 ---- a/lib/appUtil/Makefile.am -+++ b/lib/appUtil/Makefile.am -@@ -21,4 +21,6 @@ libAppUtil_la_SOURCES = - libAppUtil_la_SOURCES += appUtil.c - libAppUtil_la_SOURCES += appUtilX11.c - --AM_CFLAGS = @GTK_CPPFLAGS@ -+AM_CFLAGS = -+AM_CFLAGS += @GTK_CPPFLAGS@ -+AM_CFLAGS += @GDK_PIXBUF_XLIB2_CPPFLAGS@ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch deleted file mode 100644 index 95b0951b5853..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/lib/include/guest_os.h b/lib/include/guest_os.h -index 868dec68..0b9a2ad7 100644 ---- a/lib/include/guest_os.h -+++ b/lib/include/guest_os.h -@@ -278,6 +278,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); - #define STR_OS_MANDRAKE_FULL "Mandrake Linux" - #define STR_OS_MANDRIVA "mandriva" - #define STR_OS_MKLINUX "MkLinux" -+#define STR_OS_NIXOS "NixOS" - #define STR_OS_NOVELL "nld9" - #define STR_OS_NOVELL_FULL "Novell Linux Desktop 9" - #define STR_OS_ORACLE6 "oraclelinux6" -diff --git a/lib/misc/hostinfoPosix.c b/lib/misc/hostinfoPosix.c -index 348a67ec..5f8beb2b 100644 ---- a/lib/misc/hostinfoPosix.c -+++ b/lib/misc/hostinfoPosix.c -@@ -203,6 +203,7 @@ static const DistroInfo distroArray[] = { - { "Mandrake", "/etc/mandrake-release" }, - { "Mandriva", "/etc/mandriva-release" }, - { "MkLinux", "/etc/mklinux-release" }, -+ { "NixOS", "/etc/os-release" }, - { "Novell", "/etc/nld-release" }, - { "OracleLinux", "/etc/oracle-release" }, - { "Photon", "/etc/lsb-release" }, -@@ -865,6 +866,8 @@ HostinfoGetOSShortName(const char *distro, // IN: full distro name - } - } else if (strstr(distroLower, "mandrake")) { - Str_Strcpy(distroShort, STR_OS_MANDRAKE, distroShortSize); -+ } else if (strstr(distroLower, "nixos")) { -+ Str_Strcpy(distroShort, STR_OS_NIXOS, distroShortSize); - } else if (strstr(distroLower, "turbolinux")) { - Str_Strcpy(distroShort, STR_OS_TURBO, distroShortSize); - } else if (strstr(distroLower, "sun")) { |