signal-desktop-beta: reinit at 6.1.0-beta.1
signal-desktop-beta was removed due to maintainability concerns in
256e347dfe. Unfortunately, there are a
number of features, like stories, that are only enabled on the beta
builds. As such, this change adds that package back, but based upon the
current signal-desktop derivation.
We have restructured the derivation into the generic+versions structure
seen in libmicrohttpd, however since there are a fixed number of
releases, stable and beta, they both live default.nix and are inherited
at the top level.
I have also added myself to the maintainers list, however we could also
split that up, so that I alone bear the maintenance responsibilities.
This commit is contained in:
Colin Arnott
parent
ffca9ffaaa
commit
bd35bc1f87
@ -1,139 +1,12 @@
|
|||||||
{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook, makeWrapper, nixosTests
|
{ callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
|
||||||
, gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig
|
signal-desktop = {
|
||||||
, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite
|
dir = "Signal";
|
||||||
, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsa-lib
|
version = "6.0.1";
|
||||||
, cups, expat, libuuid, at-spi2-core, libappindicator-gtk3, mesa
|
hash = "sha256-7Cojhz3wBPd/13uVg2MgJXvR9QMPZcwBibk/sCrRMAE=";
|
||||||
# Runtime dependencies:
|
|
||||||
, systemd, libnotify, libdbusmenu, libpulseaudio, xdg-utils
|
|
||||||
}:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "signal-desktop";
|
|
||||||
version = "6.0.1"; # Please backport all updates to the stable channel.
|
|
||||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
|
||||||
# When releases "expire" the application becomes unusable until an update is
|
|
||||||
# applied. The expiration date for the current release can be extracted with:
|
|
||||||
# $ grep -a "^{\"buildExpiration" "${signal-desktop}/lib/Signal/resources/app.asar"
|
|
||||||
# (Alternatively we could try to patch the asar archive, but that requires a
|
|
||||||
# few additional steps and might not be the best idea.)
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
|
||||||
sha256 = "sha256-7Cojhz3wBPd/13uVg2MgJXvR9QMPZcwBibk/sCrRMAE=";
|
|
||||||
};
|
};
|
||||||
|
signal-desktop-beta = {
|
||||||
nativeBuildInputs = [
|
dir = "Signal Beta";
|
||||||
autoPatchelfHook
|
version = "6.1.0-beta.1";
|
||||||
dpkg
|
hash = "sha256-zfXHSAYJH9/y0IaB6dTb1T85hZzDXyNX6sCpaHnL32k=";
|
||||||
(wrapGAppsHook.override { inherit makeWrapper; })
|
|
||||||
];
|
|
||||||
|
|
||||||
buildInputs = [
|
|
||||||
alsa-lib
|
|
||||||
at-spi2-atk
|
|
||||||
at-spi2-core
|
|
||||||
atk
|
|
||||||
cairo
|
|
||||||
cups
|
|
||||||
dbus
|
|
||||||
expat
|
|
||||||
fontconfig
|
|
||||||
freetype
|
|
||||||
gdk-pixbuf
|
|
||||||
glib
|
|
||||||
gtk3
|
|
||||||
libX11
|
|
||||||
libXScrnSaver
|
|
||||||
libXcomposite
|
|
||||||
libXcursor
|
|
||||||
libXdamage
|
|
||||||
libXext
|
|
||||||
libXfixes
|
|
||||||
libXi
|
|
||||||
libXrandr
|
|
||||||
libXrender
|
|
||||||
libXtst
|
|
||||||
libappindicator-gtk3
|
|
||||||
libnotify
|
|
||||||
libuuid
|
|
||||||
mesa # for libgbm
|
|
||||||
nspr
|
|
||||||
nss
|
|
||||||
pango
|
|
||||||
systemd
|
|
||||||
xorg.libxcb
|
|
||||||
xorg.libxshmfence
|
|
||||||
];
|
|
||||||
|
|
||||||
runtimeDependencies = [
|
|
||||||
(lib.getLib systemd)
|
|
||||||
libappindicator-gtk3
|
|
||||||
libnotify
|
|
||||||
libdbusmenu
|
|
||||||
xdg-utils
|
|
||||||
];
|
|
||||||
|
|
||||||
unpackPhase = "dpkg-deb -x $src .";
|
|
||||||
|
|
||||||
dontBuild = true;
|
|
||||||
dontConfigure = true;
|
|
||||||
dontPatchELF = true;
|
|
||||||
# We need to run autoPatchelf manually with the "no-recurse" option, see
|
|
||||||
# https://github.com/NixOS/nixpkgs/pull/78413 for the reasons.
|
|
||||||
dontAutoPatchelf = true;
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
runHook preInstall
|
|
||||||
|
|
||||||
mkdir -p $out/lib
|
|
||||||
|
|
||||||
mv usr/share $out/share
|
|
||||||
mv opt/Signal $out/lib/Signal
|
|
||||||
|
|
||||||
# Note: The following path contains bundled libraries:
|
|
||||||
# $out/lib/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/lib/
|
|
||||||
# We run autoPatchelf with the "no-recurse" option to avoid picking those
|
|
||||||
# up, but resources/app.asar still requires them.
|
|
||||||
|
|
||||||
# Symlink to bin
|
|
||||||
mkdir -p $out/bin
|
|
||||||
ln -s $out/lib/Signal/signal-desktop $out/bin/signal-desktop
|
|
||||||
|
|
||||||
# Create required symlinks:
|
|
||||||
ln -s libGLESv2.so $out/lib/Signal/libGLESv2.so.2
|
|
||||||
|
|
||||||
runHook postInstall
|
|
||||||
'';
|
|
||||||
|
|
||||||
preFixup = ''
|
|
||||||
gappsWrapperArgs+=(
|
|
||||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }"
|
|
||||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
|
||||||
--suffix PATH : ${lib.makeBinPath [ xdg-utils ]}
|
|
||||||
)
|
|
||||||
|
|
||||||
# Fix the desktop link
|
|
||||||
substituteInPlace $out/share/applications/signal-desktop.desktop \
|
|
||||||
--replace /opt/Signal/signal-desktop $out/bin/signal-desktop
|
|
||||||
|
|
||||||
autoPatchelf --no-recurse -- $out/lib/Signal/
|
|
||||||
patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/Signal/resources/app.asar.unpacked/node_modules/ringrtc/build/linux/libringrtc-x64.node
|
|
||||||
'';
|
|
||||||
|
|
||||||
# Tests if the application launches and waits for "Link your phone to Signal Desktop":
|
|
||||||
passthru.tests.application-launch = nixosTests.signal-desktop;
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "Private, simple, and secure messenger";
|
|
||||||
longDescription = ''
|
|
||||||
Signal Desktop is an Electron application that links with your
|
|
||||||
"Signal Android" or "Signal iOS" app.
|
|
||||||
'';
|
|
||||||
homepage = "https://signal.org/";
|
|
||||||
changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}";
|
|
||||||
license = lib.licenses.agpl3Only;
|
|
||||||
maintainers = with lib.maintainers; [ mic92 equirosa ];
|
|
||||||
platforms = [ "x86_64-linux" ];
|
|
||||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1,180 @@
|
|||||||
|
{ pname
|
||||||
|
, dir
|
||||||
|
, version
|
||||||
|
, hash
|
||||||
|
, stdenv
|
||||||
|
, lib
|
||||||
|
, fetchurl
|
||||||
|
, autoPatchelfHook
|
||||||
|
, dpkg
|
||||||
|
, wrapGAppsHook
|
||||||
|
, makeWrapper
|
||||||
|
, nixosTests
|
||||||
|
, gtk3
|
||||||
|
, atk
|
||||||
|
, at-spi2-atk
|
||||||
|
, cairo
|
||||||
|
, pango
|
||||||
|
, gdk-pixbuf
|
||||||
|
, glib
|
||||||
|
, freetype
|
||||||
|
, fontconfig
|
||||||
|
, dbus
|
||||||
|
, libX11
|
||||||
|
, xorg
|
||||||
|
, libXi
|
||||||
|
, libXcursor
|
||||||
|
, libXdamage
|
||||||
|
, libXrandr
|
||||||
|
, libXcomposite
|
||||||
|
, libXext
|
||||||
|
, libXfixes
|
||||||
|
, libXrender
|
||||||
|
, libXtst
|
||||||
|
, libXScrnSaver
|
||||||
|
, nss
|
||||||
|
, nspr
|
||||||
|
, alsa-lib
|
||||||
|
, cups
|
||||||
|
, expat
|
||||||
|
, libuuid
|
||||||
|
, at-spi2-core
|
||||||
|
, libappindicator-gtk3
|
||||||
|
, mesa
|
||||||
|
# Runtime dependencies:
|
||||||
|
, systemd
|
||||||
|
, libnotify
|
||||||
|
, libdbusmenu
|
||||||
|
, libpulseaudio
|
||||||
|
, xdg-utils
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
inherit pname version; # Please backport all updates to the stable channel.
|
||||||
|
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||||
|
# When releases "expire" the application becomes unusable until an update is
|
||||||
|
# applied. The expiration date for the current release can be extracted with:
|
||||||
|
# $ grep -a "^{\"buildExpiration" "${signal-desktop}/lib/${dir}/resources/app.asar"
|
||||||
|
# (Alternatively we could try to patch the asar archive, but that requires a
|
||||||
|
# few additional steps and might not be the best idea.)
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://updates.signal.org/desktop/apt/pool/main/s/${pname}/${pname}_${version}_amd64.deb";
|
||||||
|
inherit hash;
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
autoPatchelfHook
|
||||||
|
dpkg
|
||||||
|
(wrapGAppsHook.override { inherit makeWrapper; })
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
alsa-lib
|
||||||
|
at-spi2-atk
|
||||||
|
at-spi2-core
|
||||||
|
atk
|
||||||
|
cairo
|
||||||
|
cups
|
||||||
|
dbus
|
||||||
|
expat
|
||||||
|
fontconfig
|
||||||
|
freetype
|
||||||
|
gdk-pixbuf
|
||||||
|
glib
|
||||||
|
gtk3
|
||||||
|
libX11
|
||||||
|
libXScrnSaver
|
||||||
|
libXcomposite
|
||||||
|
libXcursor
|
||||||
|
libXdamage
|
||||||
|
libXext
|
||||||
|
libXfixes
|
||||||
|
libXi
|
||||||
|
libXrandr
|
||||||
|
libXrender
|
||||||
|
libXtst
|
||||||
|
libappindicator-gtk3
|
||||||
|
libnotify
|
||||||
|
libuuid
|
||||||
|
mesa # for libgbm
|
||||||
|
nspr
|
||||||
|
nss
|
||||||
|
pango
|
||||||
|
systemd
|
||||||
|
xorg.libxcb
|
||||||
|
xorg.libxshmfence
|
||||||
|
];
|
||||||
|
|
||||||
|
runtimeDependencies = [
|
||||||
|
(lib.getLib systemd)
|
||||||
|
libappindicator-gtk3
|
||||||
|
libnotify
|
||||||
|
libdbusmenu
|
||||||
|
xdg-utils
|
||||||
|
];
|
||||||
|
|
||||||
|
unpackPhase = "dpkg-deb -x $src .";
|
||||||
|
|
||||||
|
dontBuild = true;
|
||||||
|
dontConfigure = true;
|
||||||
|
dontPatchELF = true;
|
||||||
|
# We need to run autoPatchelf manually with the "no-recurse" option, see
|
||||||
|
# https://github.com/NixOS/nixpkgs/pull/78413 for the reasons.
|
||||||
|
dontAutoPatchelf = true;
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
|
mkdir -p $out/lib
|
||||||
|
|
||||||
|
mv usr/share $out/share
|
||||||
|
mv "opt/${dir}" "$out/lib/${dir}"
|
||||||
|
|
||||||
|
# Note: The following path contains bundled libraries:
|
||||||
|
# $out/lib/${dir}/resources/app.asar.unpacked/node_modules/sharp/vendor/lib/
|
||||||
|
# We run autoPatchelf with the "no-recurse" option to avoid picking those
|
||||||
|
# up, but resources/app.asar still requires them.
|
||||||
|
|
||||||
|
# Symlink to bin
|
||||||
|
mkdir -p $out/bin
|
||||||
|
ln -s "$out/lib/${dir}/${pname}" $out/bin/${pname}
|
||||||
|
|
||||||
|
# Create required symlinks:
|
||||||
|
ln -s libGLESv2.so "$out/lib/${dir}/libGLESv2.so.2"
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
preFixup = ''
|
||||||
|
gappsWrapperArgs+=(
|
||||||
|
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }"
|
||||||
|
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
||||||
|
--suffix PATH : ${lib.makeBinPath [ xdg-utils ]}
|
||||||
|
)
|
||||||
|
|
||||||
|
# Fix the desktop link
|
||||||
|
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||||
|
--replace "/opt/${dir}/${pname}" $out/bin/${pname}
|
||||||
|
|
||||||
|
autoPatchelf --no-recurse -- "$out/lib/${dir}/"
|
||||||
|
patchelf --add-needed ${libpulseaudio}/lib/libpulse.so "$out/lib/${dir}/resources/app.asar.unpacked/node_modules/ringrtc/build/linux/libringrtc-x64.node"
|
||||||
|
'';
|
||||||
|
|
||||||
|
# Tests if the application launches and waits for "Link your phone to Signal Desktop":
|
||||||
|
passthru.tests.application-launch = nixosTests.signal-desktop;
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Private, simple, and secure messenger";
|
||||||
|
longDescription = ''
|
||||||
|
Signal Desktop is an Electron application that links with your
|
||||||
|
"Signal Android" or "Signal iOS" app.
|
||||||
|
'';
|
||||||
|
homepage = "https://signal.org/";
|
||||||
|
changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}";
|
||||||
|
license = lib.licenses.agpl3Only;
|
||||||
|
maintainers = with lib.maintainers; [ mic92 equirosa urandom ];
|
||||||
|
platforms = [ "x86_64-linux" ];
|
||||||
|
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||||
|
};
|
||||||
|
}
|
||||||
@ -11583,7 +11583,7 @@ with pkgs;
|
|||||||
|
|
||||||
signal-cli = callPackage ../applications/networking/instant-messengers/signal-cli { };
|
signal-cli = callPackage ../applications/networking/instant-messengers/signal-cli { };
|
||||||
|
|
||||||
signal-desktop = callPackage ../applications/networking/instant-messengers/signal-desktop { };
|
inherit (callPackage ../applications/networking/instant-messengers/signal-desktop {}) signal-desktop signal-desktop-beta;
|
||||||
|
|
||||||
slither-analyzer = with python3Packages; toPythonApplication slither-analyzer;
|
slither-analyzer = with python3Packages; toPythonApplication slither-analyzer;
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user