public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #90626 from tteggel/fix-open-vm-tools-gdk-pixbuf-xlib 

open-vm-tools: fix build
This commit is contained in:
worldofpeace 2020-06-18 18:07:58 -04:00 committed by GitHub
parent f5f8b08f16 94e7fdf439
commit af729e9751
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/virtualization/open-vm-tools/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook, { stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook,
fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps,
libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst, libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst,
pkgconfig, glib, gtk3, gtkmm3, iproute, dbus, systemd, which, pkgconfig, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute, dbus, systemd, which,
withX ? true }: withX ? true }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -21,9 +21,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ];
buildInputs = [ fuse glib icu libdnet libmspack openssl pam procps xercesc ] buildInputs = [ fuse glib icu libdnet libmspack openssl pam procps xercesc ]
++ lib.optionals withX [ 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 = [
./recognize_nixos.patch
./find_gdk_pixbuf_xlib.patch #See https://github.com/vmware/open-vm-tools/pull/438
];
patches = [ ./recognize_nixos.patch ];
postPatch = '' postPatch = ''
# Build bugfix for 10.1.0, stolen from Arch PKGBUILD # Build bugfix for 10.1.0, stolen from Arch PKGBUILD
mkdir -p common-agent/etc/config mkdir -p common-agent/etc/config

12
pkgs/applications/virtualization/open-vm-tools/find_gdk_pixbuf_xlib.patch Normal file
View File

@ -0,0 +1,12 @@
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@