diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-22 13:48:35 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-22 13:48:35 +0100 |
| commit | 0957359568389f4abca5d4176749cac736e7fe6f (patch) | |
| tree | 1c8d664ae5405cb2859a2e679e402dca0e597b5b /pkgs/applications/virtualization | |
| parent | 542bf5bf4187ec13d83d9aea64212b1dbb5a1bd9 (diff) | |
| parent | 3317eef08420a1561fc42cd97d28fc3eca8c15d7 (diff) | |
| download | nixlib-0957359568389f4abca5d4176749cac736e7fe6f.tar nixlib-0957359568389f4abca5d4176749cac736e7fe6f.tar.gz nixlib-0957359568389f4abca5d4176749cac736e7fe6f.tar.bz2 nixlib-0957359568389f4abca5d4176749cac736e7fe6f.tar.lz nixlib-0957359568389f4abca5d4176749cac736e7fe6f.tar.xz nixlib-0957359568389f4abca5d4176749cac736e7fe6f.tar.zst nixlib-0957359568389f4abca5d4176749cac736e7fe6f.zip | |
Merge branch 'staging'
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/open-vm-tools/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index e8c6b39f4933..1cd33e8b97a5 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchurl, makeWrapper, autoconf, automake, - libmspack, openssl, pam, xercesc, icu, libdnet, procps, +{ stdenv, lib, fetchurl, makeWrapper, autoreconfHook, + libmspack, openssl, pam, xercesc, icu, libdnet, procps, xlibsWrapper, libXinerama, libXi, libXrender, libXrandr, libXtst, pkgconfig, glib, gtk, gtkmm }: @@ -16,8 +16,8 @@ in stdenv.mkDerivation { sha256 = "15lwayrz9bpx4z12fj616hsn25m997y72licwwz7kms4sx9ssip1"; }; - buildInputs = - [ autoconf automake makeWrapper libmspack openssl pam xercesc icu libdnet procps + buildInputs = + [ autoreconfHook makeWrapper libmspack openssl pam xercesc icu libdnet procps pkgconfig glib gtk gtkmm xlibsWrapper libXinerama libXi libXrender libXrandr libXtst ]; patchPhase = '' @@ -28,7 +28,6 @@ in stdenv.mkDerivation { patches = [ ./recognize_nixos.patch ]; - preConfigure = "autoreconf"; configureFlags = "--without-kernel-modules --without-xmlsecurity"; meta = with stdenv.lib; { |