Merge pull request #198286 from SuperSandro2000/open-vm-tools (921b410e) · Commits · nix / nixpkgs

pkgs/applications/virtualization/open-vm-tools/default.nix

+101 −37

Original line number	Diff line number	Diff line
		{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook
		, bash, fuse3, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto
		, libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst, libxcrypt
		, pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which
		, libdrm, udev, util-linux
		{ stdenv
		, lib
		, fetchFromGitHub
		, makeWrapper
		, autoreconfHook
		, bash
		, fuse3
		, libmspack
		, openssl
		, pam
		, xercesc
		, icu
		, libdnet
		, procps
		, libtirpc
		, rpcsvc-proto
		, libX11
		, libXext
		, libXinerama
		, libXi
		, libXrender
		, libXrandr
		, libXtst
		, libxcrypt
		, libxml2
		, pkg-config
		, glib
		, gdk-pixbuf-xlib
		, gtk3
		, gtkmm3
		, iproute2
		, dbus
		, systemd
		, which
		, libdrm
		, udev
		, util-linux
		, xmlsec
		, withX ? true
		}:

		@@ -21,19 +54,57 @@ stdenv.mkDerivation rec {

		outputs = [ "out" "dev" ];

		nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ];
		buildInputs = [ fuse3 glib icu libdnet libdrm libmspack libtirpc libxcrypt openssl pam procps rpcsvc-proto udev xercesc ]
		++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ];
		nativeBuildInputs = [
		autoreconfHook
		makeWrapper
		pkg-config
		];

		postPatch = ''
		sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' Makefile.am
		sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am
		sed -i 's,usr/bin,''${prefix}/usr/bin,' scripts/Makefile.am
		sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' services/vmtoolsd/Makefile.am
		sed -i 's,$(PAM_PREFIX),''${prefix}/$(PAM_PREFIX),' services/vmtoolsd/Makefile.am
		buildInputs = [
		fuse3
		glib
		icu
		libdnet
		libdrm
		libmspack
		libtirpc
		libxcrypt
		libxml2
		openssl
		pam
		procps
		rpcsvc-proto
		udev
		xercesc
		xmlsec
		] ++ lib.optionals withX [
		gdk-pixbuf-xlib
		gtk3
		gtkmm3
		libX11
		libXext
		libXinerama
		libXi
		libXrender
		libXrandr
		libXtst
		];

		# Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
		sed 1i'#include <sys/sysmacros.h>' -i lib/wiper/wiperPosix.c
		postPatch = ''
		sed -i Makefile.am \
		-e 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,'
		sed -i scripts/Makefile.am \
		-e 's,^confdir = ,confdir = ''${prefix},' \
		-e 's,usr/bin,''${prefix}/usr/bin,'
		sed -i services/vmtoolsd/Makefile.am \
		-e 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' \
		-e 's,$(PAM_PREFIX),''${prefix}/$(PAM_PREFIX),'
		sed -i vgauth/service/Makefile.am \
		-e 's,/etc/vmware-tools/vgauth/schemas,''${prefix}/etc/vmware-tools/vgauth/schemas,' \
		-e 's,$(DESTDIR)/etc/vmware-tools/vgauth.conf,''${prefix}/etc/vmware-tools/vgauth.conf,'

		# don't abort on any warning
		sed -i 's,CFLAGS="$CFLAGS -Werror",,' configure.ac

		# Make reboot work, shutdown is not in /sbin on NixOS
		sed -i 's,/sbin/shutdown,shutdown,' lib/system/systemLinux.c
		@@ -48,19 +119,12 @@ stdenv.mkDerivation rec {

		configureFlags = [
		"--without-kernel-modules"
		"--without-xmlsecurity"
		"--with-udev-rules-dir=${placeholder "out"}/lib/udev/rules.d"
		"--with-fuse=fuse3"
		] ++ lib.optional (!withX) "--without-x";

		enableParallelBuilding = true;

		NIX_CFLAGS_COMPILE = builtins.toString [
		# fix build with gcc9
		"-Wno-error=address-of-packed-member"
		"-Wno-error=format-overflow"
		];

		preConfigure = ''
		mkdir -p ${placeholder "out"}/lib/udev/rules.d
		'';

pkgs/development/libraries/xmlsec/default.nix

+14 −8

Original line number	Diff line number	Diff line
		@@ -22,7 +22,12 @@ stdenv.mkDerivation rec {

		nativeBuildInputs = [ pkg-config ];

		buildInputs = [ libxml2 gnutls libxslt libgcrypt libtool openssl nss ];
		buildInputs = [ libxml2 gnutls libgcrypt libtool openssl nss ];

		propagatedBuildInputs = [
		# required by xmlsec/transforms.h
		libxslt
		];

		enableParallelBuilding = true;
		doCheck = true;
		@@ -67,13 +72,14 @@ stdenv.mkDerivation rec {
		touch $out
		'';

		meta = {
		meta = with lib; {
		description = "XML Security Library in C based on libxml2";
		homepage = "http://www.aleksey.com/xmlsec";
		homepage = "https://www.aleksey.com/xmlsec/";
		downloadPage = "https://www.aleksey.com/xmlsec/download.html";
		license = lib.licenses.mit;
		license = licenses.mit;
		mainProgram = "xmlsec1";
		platforms = with lib.platforms; linux ++ darwin;
		maintainers = with maintainers; [ ];
		platforms = with platforms; linux ++ darwin;
		};
		}
		)

Admin message