3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #177056 from ShamrockLee/caprine-bin

caprine-bin: 2.55.4 -> 2.55.5 and passthru pname version src
This commit is contained in:
Jonas Heinrich 2022-09-05 07:16:53 +02:00 committed by GitHub
commit 04d9951197
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 10 deletions

View file

@ -9,16 +9,19 @@
}:
let
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/sindresorhus/caprine/releases/download/v${version}/Caprine-${version}.AppImage";
name = "Caprine-${version}.AppImage";
inherit sha256;
};
extracted = appimageTools.extractType2 { inherit name src; };
extracted = appimageTools.extractType2 { inherit pname version src; };
in
(appimageTools.wrapType2 {
inherit name src;
inherit pname version src;
passthru = {
inherit pname version src;
};
profile = ''
export LC_ALL=C.UTF-8
@ -27,7 +30,7 @@ in
extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs;
extraInstallCommands = ''
mv $out/bin/{${name},caprine}
mv $out/bin/{${pname}-${version},caprine}
mkdir -p $out/share
"${xorg.lndir}/bin/lndir" -silent "${extracted}/usr/share" "$out/share"
@ -42,6 +45,4 @@ in
platforms = [ "x86_64-linux" ];
mainProgram = "caprine";
};
}) // {
inherit pname version;
}
})

View file

@ -1,7 +1,7 @@
{ lib, callPackage, stdenvNoCC }:
let
pname = "caprine";
version = "2.55.4";
version = "2.55.5";
metaCommon = with lib; {
description = "An elegant Facebook Messenger desktop app";
homepage = "https://sindresorhus.com/caprine";
@ -10,11 +10,11 @@ let
};
x86_64-appimage = callPackage ./build-from-appimage.nix {
inherit pname version metaCommon;
sha256 = "221PyDoCkWqDdewCkFycpjMTcVOcl58blCjrC7O7xyk=";
sha256 = "MMbyiLBrdMGENRq493XzkcsDoXr3Aq3rXAni1egkPbo=";
};
x86_64-dmg = callPackage ./build-from-dmg.nix {
inherit pname version metaCommon;
sha256 = "6SOqlH7Z9DuQVR4i1OltnSb4dJscFUxaXxgNkE5FVUE=";
sha256 = "1txuSQk6tH0xsjPk5cWUVnaAw4XBOr1+Fel06NLKFfk=";
};
in
(if stdenvNoCC.isDarwin then x86_64-dmg else x86_64-appimage).overrideAttrs (oldAttrs: {