diff options
author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2024-03-26 11:00:20 +0100 |
---|---|---|
committer | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2024-03-26 11:00:20 +0100 |
commit | 4f39b5c3d9afc059a968dfa5b1de2e629c6e5349 (patch) | |
tree | 8b3c3dd0a2acba00e77e2873ef7fff85a8733351 | |
parent | 73eadf877257fbd358568f3e575d1b9112da37a4 (diff) | |
download | nixlib-4f39b5c3d9afc059a968dfa5b1de2e629c6e5349.tar nixlib-4f39b5c3d9afc059a968dfa5b1de2e629c6e5349.tar.gz nixlib-4f39b5c3d9afc059a968dfa5b1de2e629c6e5349.tar.bz2 nixlib-4f39b5c3d9afc059a968dfa5b1de2e629c6e5349.tar.lz nixlib-4f39b5c3d9afc059a968dfa5b1de2e629c6e5349.tar.xz nixlib-4f39b5c3d9afc059a968dfa5b1de2e629c6e5349.tar.zst nixlib-4f39b5c3d9afc059a968dfa5b1de2e629c6e5349.zip |
aws-workspaces: 4.6.0.4187 -> 4.7.0.4312
-rw-r--r-- | pkgs/by-name/aw/aws-workspaces/package.nix (renamed from pkgs/applications/networking/remote/aws-workspaces/default.nix) | 51 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 38 insertions, 15 deletions
diff --git a/pkgs/applications/networking/remote/aws-workspaces/default.nix b/pkgs/by-name/aw/aws-workspaces/package.nix index b1e11510530a..bffc25ca4829 100644 --- a/pkgs/applications/networking/remote/aws-workspaces/default.nix +++ b/pkgs/by-name/aw/aws-workspaces/package.nix @@ -1,19 +1,39 @@ -{ 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 ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31b97fc21e1c..83d0322c43c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |