Merge pull request #115180 from toonn/wire-desktop-bump

authored by Sandro and committed by GitHub 8edfe0a2 baac2a1b

+26 -4
+1 -1
maintainers/maintainer-list.nix
··· 9636 name = "Tom Smeets"; 9637 }; 9638 toonn = { 9639 - email = "nnoot@toonn.io"; 9640 github = "toonn"; 9641 githubId = 1486805; 9642 name = "Toon Nolten";
··· 9636 name = "Tom Smeets"; 9637 }; 9638 toonn = { 9639 + email = "nixpkgs@toonn.io"; 9640 github = "toonn"; 9641 githubId = 1486805; 9642 name = "Toon Nolten";
+25 -3
pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
··· 23 24 version = { 25 x86_64-darwin = "3.21.3959"; 26 - x86_64-linux = "3.21.2936"; 27 }.${system} or throwSystem; 28 29 sha256 = { 30 x86_64-darwin = "0fgzzqf1wnkjbcr0j0vjn6sggkz0z1kx6w4gi7gk4c4markdicm1"; 31 - x86_64-linux = "033804nkz1fdmq3p8iplrlx708x1fjlr09bmrpy36lqg5h7m3yd6"; 32 }.${system} or throwSystem; 33 34 meta = with lib; { ··· 95 96 buildInputs = atomEnv.packages; 97 98 - unpackPhase = "dpkg-deb -x $src ."; 99 100 installPhase = '' 101 mkdir -p "$out/bin" 102 cp -R "opt" "$out" 103 cp -R "usr/share" "$out/share" ··· 106 # Desktop file 107 mkdir -p "$out/share/applications" 108 cp "${desktopItem}/share/applications/"* "$out/share/applications" 109 ''; 110 111 runtimeDependencies = [ ··· 134 ]; 135 136 unpackPhase = '' 137 xar -xf $src 138 cd com.wearezeta.zclient.mac.pkg 139 ''; 140 141 buildPhase = '' 142 cat Payload | gunzip -dc | cpio -i 143 ''; 144 145 installPhase = '' 146 mkdir -p $out/Applications 147 cp -r Wire.app $out/Applications 148 ''; 149 }; 150
··· 23 24 version = { 25 x86_64-darwin = "3.21.3959"; 26 + x86_64-linux = "3.22.2937"; 27 }.${system} or throwSystem; 28 29 sha256 = { 30 x86_64-darwin = "0fgzzqf1wnkjbcr0j0vjn6sggkz0z1kx6w4gi7gk4c4markdicm1"; 31 + x86_64-linux = "1pl2dsrgckkd8mm0cpxrz8i8rn4jfx7b9lvdyc8392sbq4chjcb7"; 32 }.${system} or throwSystem; 33 34 meta = with lib; { ··· 95 96 buildInputs = atomEnv.packages; 97 98 + unpackPhase = '' 99 + runHook preUnpack 100 + 101 + dpkg-deb -x $src . 102 + 103 + runHook postUnpack 104 + ''; 105 106 installPhase = '' 107 + runHook preInstall 108 + 109 mkdir -p "$out/bin" 110 cp -R "opt" "$out" 111 cp -R "usr/share" "$out/share" ··· 114 # Desktop file 115 mkdir -p "$out/share/applications" 116 cp "${desktopItem}/share/applications/"* "$out/share/applications" 117 + 118 + runHook postInstall 119 ''; 120 121 runtimeDependencies = [ ··· 144 ]; 145 146 unpackPhase = '' 147 + runHook preUnpack 148 + 149 xar -xf $src 150 cd com.wearezeta.zclient.mac.pkg 151 + 152 + runHook postUnpack 153 ''; 154 155 buildPhase = '' 156 + runHook preBuild 157 + 158 cat Payload | gunzip -dc | cpio -i 159 + 160 + runHook postBuild 161 ''; 162 163 installPhase = '' 164 + runHook preInstall 165 + 166 mkdir -p $out/Applications 167 cp -r Wire.app $out/Applications 168 + 169 + runHook postInstall 170 ''; 171 }; 172