Unverified Commit 352514e2 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #299138 from drupol/aws-workspaces/bump/4-7-0-4312 

aws-workspaces: 4.6.0.4187 -> 4.7.0.4312
parents 560066b6 4f39b5c3

pkgs/applications/networking/remote/aws-workspaces/default.nix→pkgs/by-name/aw/aws-workspaces/package.nix

+38 −13
Original line number Diff line number Diff line 
{ stdenv, lib

, makeWrapper, dpkg, fetchurl, autoPatchelfHook

, curl, libkrb5, lttng-ust, libpulseaudio, gtk3, openssl_1_1, icu70, webkitgtk, librsvg, gdk-pixbuf, libsoup, glib-networking, graphicsmagick_q16, libva, libusb1, hiredis, xcbutil

{ stdenv

, lib

, makeWrapper

, dpkg

, fetchurl

, autoPatchelfHook

, curl

, libkrb5

, lttng-ust

, libpulseaudio

, gtk3

, openssl_1_1

, icu70

, webkitgtk

, librsvg

, gdk-pixbuf

, libsoup

, glib-networking

, graphicsmagick_q16

, libva

, libusb1

, hiredis

, xcbutil

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "aws-workspaces";

  version = "4.6.0.4187";

  version = "4.7.0.4312";



  src = fetchurl {

    # ref https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/focal/main/binary-amd64/Packages

    # Check new version at https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/focal/main/binary-amd64/Packages

    urls = [

      "https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/focal/main/binary-amd64/workspacesclient_${version}_amd64.deb"

      "https://archive.org/download/workspacesclient_${version}_amd64/workspacesclient_${version}_amd64.deb"

      "https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/focal/main/binary-amd64/workspacesclient_${finalAttrs.version}_amd64.deb"

      "https://archive.org/download/workspacesclient_${finalAttrs.version}_amd64/workspacesclient_${finalAttrs.version}_amd64.deb"

    ];

    sha256 = "sha256-A+b79ewh4hBIf8jgK0INILFktTqRRpOgXRH0FGziV6c=";

    hash = "sha256-G0o5uFnEkiUWmkTMUHlVcidw+2x8e/KmMfVBE7oLXV8=";

  };



  nativeBuildInputs = [
@@ -57,24 +77,29 @@ stdenv.mkDerivation rec { 
  '';



  installPhase = ''

    runHook preInstall



    mkdir -p $out/bin $out/lib

    mv $out/opt/workspacesclient/* $out/lib

    rm -rf $out/opt



    wrapProgram $out/lib/workspacesclient \

      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \

      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" \

      --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \

      --set GIO_EXTRA_MODULES "${glib-networking.out}/lib/gio/modules"



    mv $out/lib/workspacesclient $out/bin



    runHook postInstall

  '';



  meta = with lib; {

    description = "Client for Amazon WorkSpaces, a managed, secure Desktop-as-a-Service (DaaS) solution";

    homepage = "https://clients.amazonworkspaces.com";

    sourceProvenance = with sourceTypes; [ binaryNativeCode ];

    license = licenses.unfree;

    platforms = [ "x86_64-linux" ]; # TODO Mac support

    mainProgram = "workspacesclient";

    maintainers = with maintainers; [ mausch dylanmtaylor ];

    platforms = [ "x86_64-linux" ]; # TODO Mac support

    sourceProvenance = with sourceTypes; [ binaryNativeCode ];

  };

}
 
})

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -3379,8 +3379,6 @@ with pkgs; 














  aws-vault = callPackage ../tools/admin/aws-vault { };



























  aws-workspaces = callPackage ../applications/networking/remote/aws-workspaces { };



























  iamy = callPackage ../tools/admin/iamy { };





























  iam-policy-json-to-terraform = callPackage ../tools/misc/iam-policy-json-to-terraform { };