summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdomas Jatužis <adomixaszvers@gmail.com>2021-08-04 13:47:30 +0300
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2021-09-29 15:21:54 +0000
commit064121ec5a2bd78acc0e9bb06ab7fe3858f2e3bb (patch)
tree86b7a2462716897b56022b554ae1bb76c1fadd47
parentMerge pull request #139586 from maxeaubrey/21.05_vscode_1.60.2 (diff)
downloadnixpkgs-064121ec5a2bd78acc0e9bb06ab7fe3858f2e3bb.tar.gz
rambox: 0.7.7 -> 0.7.8
(cherry picked from commit ff783132f0d9934fde046ed7067d2508e274df18)
-rw-r--r--pkgs/applications/networking/instant-messengers/rambox/default.nix9
-rw-r--r--pkgs/applications/networking/instant-messengers/rambox/rambox.nix5
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix
index 8782a4bc5beb..418d490bbd5e 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix
@@ -4,16 +4,16 @@ let
mkRambox = opts: callPackage (import ./rambox.nix opts) { };
in mkRambox rec {
pname = "rambox";
- version = "0.7.7";
+ version = "0.7.8";
src = {
x86_64-linux = fetchurl {
url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-x86_64.AppImage";
- sha256 = "0f82hq0dzcjicdz6lkzj8889y100yqciqrwh8wjjy9pxkhjcdini";
+ sha256 = "1y3c9xh8594ay95rj9vaqxxzibwpc38n7ixxi2wnsrdbrqrwlc63";
};
i686-linux = fetchurl {
url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-i386.AppImage";
- sha256 = "1nhgqjha10jvyf9nsghvlkibg7byj8qz140639ygag9qlpd52rfs";
+ sha256 = "07sv384nd2i701fkjgsrlib8jfsa01bvj60gnqdwlnpphlknga3h";
};
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
@@ -24,8 +24,5 @@ in mkRambox rec {
maintainers = with maintainers; [ ];
platforms = ["i686-linux" "x86_64-linux"];
hydraPlatforms = [];
- knownVulnerabilities = [
- "Electron 7.2.4 is EOL and contains at least the following vulnerabilities: CVE-2020-6458, CVE-2020-6460 and more (https://www.electronjs.org/releases/stable?version=7). Consider using an alternative such as `ferdi'."
- ];
};
}
diff --git a/pkgs/applications/networking/instant-messengers/rambox/rambox.nix b/pkgs/applications/networking/instant-messengers/rambox/rambox.nix
index 56930f561c78..df038611c3b1 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/rambox.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/rambox.nix
@@ -1,6 +1,6 @@
{ pname, version, src, meta, desktopName ? "Rambox" }:
-{ appimageTools, lib, fetchurl, makeDesktopItem }:
+{ appimageTools, lib, fetchurl, gsettings-desktop-schemas, gtk3, makeDesktopItem }:
let
name = "${pname}-${version}";
@@ -19,6 +19,9 @@ let
};
in appimageTools.wrapType2 rec {
inherit name src meta;
+ profile = ''
+ export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
+ '';
extraInstallCommands = ''
mkdir -p $out/share/applications $out/share/icons/hicolor/256x256/apps