mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-29 14:57:28 +03:00
open-vm-tools: 12.0.0 -> 12.0.5 (#174744)
* open-vm-tools: 12.0.0 -> 12.0.5 * remove unused fetchpatch
This commit is contained in:
parent
7b2f132ad5
commit
e37248668b
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, lib, fetchFromGitHub, fetchpatch, makeWrapper, autoreconfHook
|
{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook
|
||||||
, bash, fuse3, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto
|
, bash, fuse3, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto
|
||||||
, libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst
|
, libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst
|
||||||
, pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which
|
, pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which
|
||||||
@ -8,13 +8,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "open-vm-tools";
|
pname = "open-vm-tools";
|
||||||
version = "12.0.0";
|
version = "12.0.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "vmware";
|
owner = "vmware";
|
||||||
repo = "open-vm-tools";
|
repo = "open-vm-tools";
|
||||||
rev = "stable-${version}";
|
rev = "stable-${version}";
|
||||||
sha256 = "sha256-agWTGf8x6bxZ7S5bU2scHt8IdLLe/hZdaEMfHIK9d8U=";
|
sha256 = "sha256-rjYYRh4ZWAd9iELW2/4PZvMOfQfgwtGcrI2icaed2Eg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
sourceRoot = "${src.name}/open-vm-tools";
|
sourceRoot = "${src.name}/open-vm-tools";
|
||||||
@ -25,21 +25,7 @@ stdenv.mkDerivation rec {
|
|||||||
buildInputs = [ fuse3 glib icu libdnet libdrm libmspack libtirpc openssl pam procps rpcsvc-proto udev xercesc ]
|
buildInputs = [ fuse3 glib icu libdnet libdrm libmspack libtirpc openssl pam procps rpcsvc-proto udev xercesc ]
|
||||||
++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ];
|
++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ];
|
||||||
|
|
||||||
patches = [
|
|
||||||
# glibc 2.35 and GCC 11 & 12 reporting possible array bounds overflow
|
|
||||||
# Will be fixed in the release after 12.0.0
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/vmware/open-vm-tools/commit/de6d129476724668b8903e2a87654f50ba21b1b2.patch";
|
|
||||||
sha256 = "1cqhm868g40kcp8qzzwq10zd4bah9ypaw1qawnli5d240mlkpfhh";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
prePatch = ''
|
|
||||||
cd ..
|
|
||||||
'';
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
cd open-vm-tools
|
|
||||||
sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' Makefile.am
|
sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' Makefile.am
|
||||||
sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/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,usr/bin,''${prefix}/usr/bin,' scripts/Makefile.am
|
||||||
|
Loading…
Reference in New Issue
Block a user