dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #149955 from Flakebi/signald

Browse Source 
signald: 0.14.1 -> 0.15.0
This commit is contained in:
Jörg Thalheim 2021-12-11 16:14:50 +00:00 committed by GitHub
commit 887da2479d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/applications/networking/instant-messengers/signald/default.nix
View File

@ -1,15 +1,15 @@
{ lib, stdenv, fetchurl, fetchFromGitLab, jre_headless, coreutils, gradle_6, git, perl { lib, stdenv, fetchurl, fetchFromGitLab, jdk17_headless, coreutils, gradle_6, git, perl
, makeWrapper }: , makeWrapper }:
let let
pname = "signald"; pname = "signald";
version = "0.14.1"; version = "0.15.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "K/G5+w1GINLZwJIG5a7u0TxlGe+Cyp4wQm+pgm28qCA="; sha256 = "ftK+oeqzJ+TxrlvqivFkAi5RCcyJ5Y0oQAJuo0YheBg=";
}; };
buildConfigJar = fetchurl { buildConfigJar = fetchurl {
@ -17,15 +17,10 @@ let
sha256 = "0y1f42y7ilm3ykgnm6s3ks54d71n8lsy5649xgd9ahv28lj05x9f"; sha256 = "0y1f42y7ilm3ykgnm6s3ks54d71n8lsy5649xgd9ahv28lj05x9f";
}; };
postPatch = ''
patchShebangs gradlew
sed -i -e 's|BuildConfig.jar|${buildConfigJar}|' build.gradle
'';
# fake build to pre-download deps into fixed-output derivation # fake build to pre-download deps into fixed-output derivation
deps = stdenv.mkDerivation { deps = stdenv.mkDerivation {
name = "${pname}-deps"; pname = "${pname}-deps";
inherit src version postPatch; inherit src version;
nativeBuildInputs = [ gradle_6 perl ]; nativeBuildInputs = [ gradle_6 perl ];
buildPhase = '' buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d) export GRADLE_USER_HOME=$(mktemp -d)
@ -43,16 +38,20 @@ let
outputHashMode = "recursive"; outputHashMode = "recursive";
# Downloaded jars differ by platform # Downloaded jars differ by platform
outputHash = { outputHash = {
x86_64-linux = "/gJFoT+vvdSWr33oI44XiZXlFfyUjtRVB1M6CMzSztM="; x86_64-linux = "gEaOOsELhfKC1cFV8tqRHbBUI6+M/cDOaqN8FQ1J/TE=";
aarch64-linux = "v71stMWBbNALasfGAHvsVTBaDOZfpKK3sQrjNJ6FG1A="; aarch64-linux = "UhnQ+Ge48/NdTqUWIxd0VNadHFvQ9awBTtn65Nz3+UM=";
}.${stdenv.system} or (throw "Unsupported platform"); }.${stdenv.system} or (throw "Unsupported platform");
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
inherit pname src version postPatch; inherit pname src version;
patches = [ ./gradle-plugin.patch ]; patches = [ ./gradle-plugin.patch ];
postPatch = ''
sed -i 's|BuildConfig.jar|${buildConfigJar}|' build.gradle
'';
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
@ -73,7 +72,7 @@ in stdenv.mkDerivation rec {
tar xvf ./build/distributions/signald.tar --strip-components=1 --directory $out/ tar xvf ./build/distributions/signald.tar --strip-components=1 --directory $out/
wrapProgram $out/bin/signald \ wrapProgram $out/bin/signald \
--prefix PATH : ${lib.makeBinPath [ coreutils ]} \ --prefix PATH : ${lib.makeBinPath [ coreutils ]} \
--set JAVA_HOME "${jre_headless}" --set JAVA_HOME "${jdk17_headless}"
runHook postInstall runHook postInstall
''; '';