Unverified Commit 2997185e authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

signal-cli: 0.13.24 -> 0.14.1 (#501468)

parents 5e926560 450a3454

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -14183,6 +14183,12 @@ 
    github = "klDen";

    githubId = 5478260;

  };

  klea = {

    email = "klea+nixos@iwnp.org";

    github = "notklea";

    githubId = 231780064;

    name = "Klea";

  };

  klntsky = {

    email = "klntsky@gmail.com";

    name = "Vladimir Kalnitsky";

pkgs/by-name/si/signal-cli/package.nix

+8 −8
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
  lib,

  fetchurl,

  makeWrapper,

  openjdk21_headless,

  openjdk25_headless,

  libmatthew_java,

  dbus,

  dbus_java,
@@ -12,12 +12,12 @@ 


stdenvNoCC.mkDerivation (finalAttrs: {

  pname = "signal-cli";

  version = "0.13.24";

  version = "0.14.1";



  # Building from source would be preferred, but is much more involved.

  src = fetchurl {

    url = "https://github.com/AsamK/signal-cli/releases/download/v${finalAttrs.version}/signal-cli-${finalAttrs.version}.tar.gz";

    hash = "sha256-Xg43pmLi5k+H58UYOhtzYogjuJWQcHxU5IsIS+Zd1D8=";

    hash = "sha256-zs2ksSxCwYhEZ/Oh8BN3U2ISwqXPshCl82HoL4wWNug=";

  };



  buildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [
@@ -36,8 +36,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { 
  + (

    if stdenvNoCC.hostPlatform.isLinux then

      ''

        makeWrapper ${openjdk21_headless}/bin/java $out/bin/signal-cli \

          --set JAVA_HOME "${openjdk21_headless}" \

        makeWrapper ${openjdk25_headless}/bin/java $out/bin/signal-cli \

          --set JAVA_HOME "${openjdk25_headless}" \

          --add-flags "-classpath '$out/lib/*:${libmatthew_java}/lib/jni'" \

          --add-flags "-Djava.library.path=${libmatthew_java}/lib/jni:${dbus_java}/share/java/dbus:$out/lib" \

          --add-flags "org.asamk.signal.Main"
@@ -45,8 +45,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { 
    else

      ''

        wrapProgram $out/bin/signal-cli \

          --prefix PATH : ${lib.makeBinPath [ openjdk21_headless ]} \

          --set JAVA_HOME ${openjdk21_headless}

          --prefix PATH : ${lib.makeBinPath [ openjdk25_headless ]} \

          --set JAVA_HOME ${openjdk25_headless}

      ''

  )

  + ''
@@ -71,7 +71,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { 
    changelog = "https://github.com/AsamK/signal-cli/blob/v${finalAttrs.version}/CHANGELOG.md";

    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];

    license = lib.licenses.gpl3;

    maintainers = [ ];

    maintainers = [ lib.maintainers.klea ];

    platforms = lib.platforms.all;

  };

})