Unverified Commit e2855c66 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

Merge pull request #334396 from kjeremy/jkolb/open-vm-tools-by-name 

open-vm-tools: move to package by name
parents f2397858 3f7a7124

pkgs/applications/virtualization/open-vm-tools/default.nix→pkgs/by-name/op/open-vm-tools/package.nix

+92 −72
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

, libxml2

, pkg-config

, glib

, gdk-pixbuf-xlib

, gtk3

, gtkmm3

, iproute2

, dbus

, systemd

, which

, libdrm

, udev

, util-linux

, xmlsec

, withX ? true

{

  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,

}:



stdenv.mkDerivation (finalAttrs: {
@@ -52,7 +53,10 @@ stdenv.mkDerivation (finalAttrs: { 


  sourceRoot = "${finalAttrs.src.name}/open-vm-tools";



  outputs = [ "out" "dev" ];

  outputs = [

    "out"

    "dev"

  ];



  nativeBuildInputs = [

    autoreconfHook
@@ -60,7 +64,8 @@ stdenv.mkDerivation (finalAttrs: { 
    pkg-config

  ];



  buildInputs = [

  buildInputs =

    [

      fuse3

      glib

      icu
@@ -77,7 +82,8 @@ stdenv.mkDerivation (finalAttrs: { 
      udev

      xercesc

      xmlsec

  ] ++ lib.optionals withX [

    ]

    ++ lib.optionals withX [

      gdk-pixbuf-xlib

      gtk3

      gtkmm3
@@ -131,7 +137,14 @@ stdenv.mkDerivation (finalAttrs: { 


  postInstall = ''

    wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \

      --prefix PATH ':' "${lib.makeBinPath [ iproute2 dbus systemd which ]}"

      --prefix PATH ':' "${

        lib.makeBinPath [

          iproute2

          dbus

          systemd

          which

        ]

      }"

    substituteInPlace "$out/lib/udev/rules.d/99-vmware-scsi-udev.rules" --replace "/bin/sh" "${bash}/bin/sh"

  '';
@@ -144,7 +157,14 @@ stdenv.mkDerivation (finalAttrs: { 
      better management of, and seamless user interactions with, guests.

    '';

    license = licenses.gpl2;

    platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];

    maintainers = with maintainers; [ joamaki kjeremy ];

    platforms = [

      "x86_64-linux"

      "i686-linux"

      "aarch64-linux"

    ];

    maintainers = with maintainers; [

      joamaki

      kjeremy

    ];

  };

})

pkgs/top-level/all-packages.nix

+0 −1
Original line number Diff line number Diff line
@@ -26872,7 +26872,6 @@ with pkgs; 














  ocf-resource-agents = callPackage ../os-specific/linux/ocf-resource-agents { };



























  open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { };















  open-vm-tools-headless = open-vm-tools.override { withX = false; };





























  oxtools = callPackage ../os-specific/linux/oxtools { };