git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #115180 from toonn/wire-desktop-bump
commit8edfe0a2e8bfc750f7ac2818b2a4f364124806b6 authorSandro <sandro.jaeckel@gmail.com> dateSat 6 Mar 2021, 05:01 (6 years ago) parentbaac2a15d6f159
2 files changed+26−4
maintainers/maintainer-list.nix+1−1 pkgs/applications/networking/instant-messengers/wire-desktop/default.nix+25−3
maintainers/maintainer-list.nix+1−1
@@ -9636,7 +9636,7 @@
96369636 name = "Tom Smeets";
96379637 };
96389638 toonn = {
9639− email = "nnoot@toonn.io";
9639+ email = "nixpkgs@toonn.io";
96409640 github = "toonn";
96419641 githubId = 1486805;
96429642 name = "Toon Nolten";
pkgs/applications/networking/instant-messengers/wire-desktop/default.nix+25−3
@@ -23,12 +23,12 @@ let
2323
2424 version = {
2525 x86_64-darwin = "3.21.3959";
26− x86_64-linux = "3.21.2936";
26+ x86_64-linux = "3.22.2937";
2727 }.${system} or throwSystem;
2828
2929 sha256 = {
3030 x86_64-darwin = "0fgzzqf1wnkjbcr0j0vjn6sggkz0z1kx6w4gi7gk4c4markdicm1";
31− x86_64-linux = "033804nkz1fdmq3p8iplrlx708x1fjlr09bmrpy36lqg5h7m3yd6";
31+ x86_64-linux = "1pl2dsrgckkd8mm0cpxrz8i8rn4jfx7b9lvdyc8392sbq4chjcb7";
3232 }.${system} or throwSystem;
3333
3434 meta = with lib; {
@@ -95,9 +95,17 @@ let
9595
9696 buildInputs = atomEnv.packages;
9797
98− unpackPhase = "dpkg-deb -x $src .";
98+ unpackPhase = ''
99+ runHook preUnpack
100+
101+ dpkg-deb -x $src .
102+
103+ runHook postUnpack
104+ '';
99105
100106 installPhase = ''
107+ runHook preInstall
108+
101109 mkdir -p "$out/bin"
102110 cp -R "opt" "$out"
103111 cp -R "usr/share" "$out/share"
@@ -106,6 +114,8 @@ let
106114 # Desktop file
107115 mkdir -p "$out/share/applications"
108116 cp "${desktopItem}/share/applications/"* "$out/share/applications"
117+
118+ runHook postInstall
109119 '';
110120
111121 runtimeDependencies = [
@@ -134,17 +144,29 @@ let
134144 ];
135145
136146 unpackPhase = ''
147+ runHook preUnpack
148+
137149 xar -xf $src
138150 cd com.wearezeta.zclient.mac.pkg
151+
152+ runHook postUnpack
139153 '';
140154
141155 buildPhase = ''
156+ runHook preBuild
157+
142158 cat Payload | gunzip -dc | cpio -i
159+
160+ runHook postBuild
143161 '';
144162
145163 installPhase = ''
164+ runHook preInstall
165+
146166 mkdir -p $out/Applications
147167 cp -r Wire.app $out/Applications
168+
169+ runHook postInstall
148170 '';
149171 };
150172