From 4e11ad645b98e266c19b1cb8005f6d6d2d7a421c Mon Sep 17 00:00:00 2001 From: toonn Date: Fri, 5 Mar 2021 12:26:33 +0100 Subject: [PATCH 1/3] Update maintainer email --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 78fc353a8bf..5cfa9eaab78 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9618,7 +9618,7 @@ name = "Tom Smeets"; }; toonn = { - email = "nnoot@toonn.io"; + email = "nixpkgs@toonn.io"; github = "toonn"; githubId = 1486805; name = "Toon Nolten"; From dd4b13bcf3ce503930c1124a8b8295830171ca56 Mon Sep 17 00:00:00 2001 From: toonn Date: Fri, 5 Mar 2021 12:27:06 +0100 Subject: [PATCH 2/3] wire-desktop: linux 3.21.2936 -> 3.22.2937 --- .../networking/instant-messengers/wire-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 966583d2089..0cfd4ab61b9 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -23,12 +23,12 @@ let version = { x86_64-darwin = "3.21.3959"; - x86_64-linux = "3.21.2936"; + x86_64-linux = "3.22.2937"; }.${system} or throwSystem; sha256 = { x86_64-darwin = "0fgzzqf1wnkjbcr0j0vjn6sggkz0z1kx6w4gi7gk4c4markdicm1"; - x86_64-linux = "033804nkz1fdmq3p8iplrlx708x1fjlr09bmrpy36lqg5h7m3yd6"; + x86_64-linux = "1pl2dsrgckkd8mm0cpxrz8i8rn4jfx7b9lvdyc8392sbq4chjcb7"; }.${system} or throwSystem; meta = with lib; { From 5d6f159ee6027c658d136f89b52cd4700d75dd8a Mon Sep 17 00:00:00 2001 From: toonn Date: Fri, 5 Mar 2021 18:07:53 +0100 Subject: [PATCH 3/3] wire-desktop: Add missing phase hooks --- .../wire-desktop/default.nix | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 0cfd4ab61b9..09a5d781c44 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -95,9 +95,17 @@ let buildInputs = atomEnv.packages; - unpackPhase = "dpkg-deb -x $src ."; + unpackPhase = '' + runHook preUnpack + + dpkg-deb -x $src . + + runHook postUnpack + ''; installPhase = '' + runHook preInstall + mkdir -p "$out/bin" cp -R "opt" "$out" cp -R "usr/share" "$out/share" @@ -106,6 +114,8 @@ let # Desktop file mkdir -p "$out/share/applications" cp "${desktopItem}/share/applications/"* "$out/share/applications" + + runHook postInstall ''; runtimeDependencies = [ @@ -134,17 +144,29 @@ let ]; unpackPhase = '' + runHook preUnpack + xar -xf $src cd com.wearezeta.zclient.mac.pkg + + runHook postUnpack ''; buildPhase = '' + runHook preBuild + cat Payload | gunzip -dc | cpio -i + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/Applications cp -r Wire.app $out/Applications + + runHook postInstall ''; };