b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Sandro 2021-03-06 05:01:08 +01:00 committed by GitHub
parent baac2a1b86 5d6f159ee6
commit 8edfe0a2e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
maintainers/maintainer-list.nix
View file

@ -9636,7 +9636,7 @@
name = "Tom Smeets"; name = "Tom Smeets";
}; };
toonn = { toonn = {
email = "nnoot@toonn.io"; email = "nixpkgs@toonn.io";
github = "toonn"; github = "toonn";
githubId = 1486805; githubId = 1486805;
name = "Toon Nolten"; name = "Toon Nolten";

28
pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
View file

@ -23,12 +23,12 @@ let
version = { version = {
x86_64-darwin = "3.21.3959"; x86_64-darwin = "3.21.3959";
x86_64-linux = "3.21.2936"; x86_64-linux = "3.22.2937";
}.${system} or throwSystem; }.${system} or throwSystem;
sha256 = { sha256 = {
x86_64-darwin = "0fgzzqf1wnkjbcr0j0vjn6sggkz0z1kx6w4gi7gk4c4markdicm1"; x86_64-darwin = "0fgzzqf1wnkjbcr0j0vjn6sggkz0z1kx6w4gi7gk4c4markdicm1";
x86_64-linux = "033804nkz1fdmq3p8iplrlx708x1fjlr09bmrpy36lqg5h7m3yd6"; x86_64-linux = "1pl2dsrgckkd8mm0cpxrz8i8rn4jfx7b9lvdyc8392sbq4chjcb7";
}.${system} or throwSystem; }.${system} or throwSystem;
meta = with lib; { meta = with lib; {
@ -95,9 +95,17 @@ let
buildInputs = atomEnv.packages; buildInputs = atomEnv.packages;
unpackPhase = "dpkg-deb -x $src ."; unpackPhase = ''
runHook preUnpack
dpkg-deb -x $src .
runHook postUnpack
'';
installPhase = '' installPhase = ''
runHook preInstall
mkdir -p "$out/bin" mkdir -p "$out/bin"
cp -R "opt" "$out" cp -R "opt" "$out"
cp -R "usr/share" "$out/share" cp -R "usr/share" "$out/share"
@ -106,6 +114,8 @@ let
# Desktop file # Desktop file
mkdir -p "$out/share/applications" mkdir -p "$out/share/applications"
cp "${desktopItem}/share/applications/"* "$out/share/applications" cp "${desktopItem}/share/applications/"* "$out/share/applications"
runHook postInstall
''; '';
runtimeDependencies = [ runtimeDependencies = [
@ -134,17 +144,29 @@ let
]; ];
unpackPhase = '' unpackPhase = ''
runHook preUnpack
xar -xf $src xar -xf $src
cd com.wearezeta.zclient.mac.pkg cd com.wearezeta.zclient.mac.pkg
runHook postUnpack
''; '';
buildPhase = '' buildPhase = ''
runHook preBuild
cat Payload | gunzip -dc | cpio -i cat Payload | gunzip -dc | cpio -i
runHook postBuild
''; '';
installPhase = '' installPhase = ''
runHook preInstall
mkdir -p $out/Applications mkdir -p $out/Applications
cp -r Wire.app $out/Applications cp -r Wire.app $out/Applications
runHook postInstall
''; '';
}; };