pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #198286 from SuperSandro2000/open-vm-tools

authored by Sandro and committed by GitHub 921b410e f8b1eb8f

+111 -41
unified split
+97 -33
pkgs/applications/virtualization/open-vm-tools/default.nix
··· 1 - { stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook 2 - , bash, fuse3, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto 3 - , libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst, libxcrypt 4 - , pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which 5 - , libdrm, udev, util-linux 1 + { stdenv 2 + , lib 3 + , fetchFromGitHub 4 + , makeWrapper 5 + , autoreconfHook 6 + , bash 7 + , fuse3 8 + , libmspack 9 + , openssl 10 + , pam 11 + , xercesc 12 + , icu 13 + , libdnet 14 + , procps 15 + , libtirpc 16 + , rpcsvc-proto 17 + , libX11 18 + , libXext 19 + , libXinerama 20 + , libXi 21 + , libXrender 22 + , libXrandr 23 + , libXtst 24 + , libxcrypt 25 + , libxml2 26 + , pkg-config 27 + , glib 28 + , gdk-pixbuf-xlib 29 + , gtk3 30 + , gtkmm3 31 + , iproute2 32 + , dbus 33 + , systemd 34 + , which 35 + , libdrm 36 + , udev 37 + , util-linux 38 + , xmlsec 6 39 , withX ? true 7 40 }: 8 41 ··· 11 44 version = "12.1.0"; 12 45 13 46 src = fetchFromGitHub { 14 - owner = "vmware"; 15 - repo = "open-vm-tools"; 16 - rev = "stable-${version}"; 47 + owner = "vmware"; 48 + repo = "open-vm-tools"; 49 + rev = "stable-${version}"; 17 50 hash = "sha256-PgrLu0Bm9Vom5WNl43312QFWKojdXDAGn3Nvj4hzPrQ="; 18 51 }; 19 52 ··· 21 54 22 55 outputs = [ "out" "dev" ]; 23 56 24 - nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; 25 - buildInputs = [ fuse3 glib icu libdnet libdrm libmspack libtirpc libxcrypt openssl pam procps rpcsvc-proto udev xercesc ] 26 - ++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; 57 + nativeBuildInputs = [ 58 + autoreconfHook 59 + makeWrapper 60 + pkg-config 61 + ]; 62 + 63 + buildInputs = [ 64 + fuse3 65 + glib 66 + icu 67 + libdnet 68 + libdrm 69 + libmspack 70 + libtirpc 71 + libxcrypt 72 + libxml2 73 + openssl 74 + pam 75 + procps 76 + rpcsvc-proto 77 + udev 78 + xercesc 79 + xmlsec 80 + ] ++ lib.optionals withX [ 81 + gdk-pixbuf-xlib 82 + gtk3 83 + gtkmm3 84 + libX11 85 + libXext 86 + libXinerama 87 + libXi 88 + libXrender 89 + libXrandr 90 + libXtst 91 + ]; 27 92 28 93 postPatch = '' 29 - sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' Makefile.am 30 - sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am 31 - sed -i 's,usr/bin,''${prefix}/usr/bin,' scripts/Makefile.am 32 - sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' services/vmtoolsd/Makefile.am 33 - sed -i 's,$(PAM_PREFIX),''${prefix}/$(PAM_PREFIX),' services/vmtoolsd/Makefile.am 94 + sed -i Makefile.am \ 95 + -e 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' 96 + sed -i scripts/Makefile.am \ 97 + -e 's,^confdir = ,confdir = ''${prefix},' \ 98 + -e 's,usr/bin,''${prefix}/usr/bin,' 99 + sed -i services/vmtoolsd/Makefile.am \ 100 + -e 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' \ 101 + -e 's,$(PAM_PREFIX),''${prefix}/$(PAM_PREFIX),' 102 + sed -i vgauth/service/Makefile.am \ 103 + -e 's,/etc/vmware-tools/vgauth/schemas,''${prefix}/etc/vmware-tools/vgauth/schemas,' \ 104 + -e 's,$(DESTDIR)/etc/vmware-tools/vgauth.conf,''${prefix}/etc/vmware-tools/vgauth.conf,' 34 105 35 - # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror. 36 - sed 1i'#include <sys/sysmacros.h>' -i lib/wiper/wiperPosix.c 106 + # don't abort on any warning 107 + sed -i 's,CFLAGS="$CFLAGS -Werror",,' configure.ac 37 108 38 - # Make reboot work, shutdown is not in /sbin on NixOS 39 - sed -i 's,/sbin/shutdown,shutdown,' lib/system/systemLinux.c 109 + # Make reboot work, shutdown is not in /sbin on NixOS 110 + sed -i 's,/sbin/shutdown,shutdown,' lib/system/systemLinux.c 40 111 41 - # Fix paths to fuse3 (we do not use fuse2 so that is not modified) 42 - sed -i 's,/bin/fusermount3,${fuse3}/bin/fusermount3,' vmhgfs-fuse/config.c 112 + # Fix paths to fuse3 (we do not use fuse2 so that is not modified) 113 + sed -i 's,/bin/fusermount3,${fuse3}/bin/fusermount3,' vmhgfs-fuse/config.c 43 114 44 - substituteInPlace services/plugins/vix/foundryToolsDaemon.c \ 45 - --replace "/usr/bin/vmhgfs-fuse" "${placeholder "out"}/bin/vmhgfs-fuse" \ 46 - --replace "/bin/mount" "${util-linux}/bin/mount" 115 + substituteInPlace services/plugins/vix/foundryToolsDaemon.c \ 116 + --replace "/usr/bin/vmhgfs-fuse" "${placeholder "out"}/bin/vmhgfs-fuse" \ 117 + --replace "/bin/mount" "${util-linux}/bin/mount" 47 118 ''; 48 119 49 120 configureFlags = [ 50 121 "--without-kernel-modules" 51 - "--without-xmlsecurity" 52 122 "--with-udev-rules-dir=${placeholder "out"}/lib/udev/rules.d" 53 123 "--with-fuse=fuse3" 54 124 ] ++ lib.optional (!withX) "--without-x"; 55 125 56 126 enableParallelBuilding = true; 57 127 58 - NIX_CFLAGS_COMPILE = builtins.toString [ 59 - # fix build with gcc9 60 - "-Wno-error=address-of-packed-member" 61 - "-Wno-error=format-overflow" 62 - ]; 63 - 64 128 preConfigure = '' 65 129 mkdir -p ${placeholder "out"}/lib/udev/rules.d 66 130 ''; ··· 79 143 better management of, and seamless user interactions with, guests. 80 144 ''; 81 145 license = licenses.gpl2; 82 - platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; 146 + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; 83 147 maintainers = with maintainers; [ joamaki ]; 84 148 }; 85 149 }
+14 -8
pkgs/development/libraries/xmlsec/default.nix
··· 22 22 23 23 nativeBuildInputs = [ pkg-config ]; 24 24 25 - buildInputs = [ libxml2 gnutls libxslt libgcrypt libtool openssl nss ]; 25 + buildInputs = [ libxml2 gnutls libgcrypt libtool openssl nss ]; 26 + 27 + propagatedBuildInputs = [ 28 + # required by xmlsec/transforms.h 29 + libxslt 30 + ]; 26 31 27 32 enableParallelBuilding = true; 28 33 doCheck = true; 29 34 checkInputs = [ nss.tools ]; 30 35 preCheck = '' 31 - substituteInPlace tests/testrun.sh \ 32 - --replace 'timestamp=`date +%Y%m%d_%H%M%S`' 'timestamp=19700101_000000' \ 33 - --replace 'TMPFOLDER=/tmp' '$(mktemp -d)' 36 + substituteInPlace tests/testrun.sh \ 37 + --replace 'timestamp=`date +%Y%m%d_%H%M%S`' 'timestamp=19700101_000000' \ 38 + --replace 'TMPFOLDER=/tmp' '$(mktemp -d)' 34 39 ''; 35 40 36 41 # enable deprecated soap headers required by lasso ··· 67 72 touch $out 68 73 ''; 69 74 70 - meta = { 75 + meta = with lib; { 71 76 description = "XML Security Library in C based on libxml2"; 72 - homepage = "http://www.aleksey.com/xmlsec"; 77 + homepage = "https://www.aleksey.com/xmlsec/"; 73 78 downloadPage = "https://www.aleksey.com/xmlsec/download.html"; 74 - license = lib.licenses.mit; 79 + license = licenses.mit; 75 80 mainProgram = "xmlsec1"; 76 - platforms = with lib.platforms; linux ++ darwin; 81 + maintainers = with maintainers; [ ]; 82 + platforms = with platforms; linux ++ darwin; 77 83 }; 78 84 } 79 85 )