movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-05 15:22:36 +03:00
Code Activity

Partially revert "chromiumDev: 97.0.4692.20 -> 98.0.4710.4"

Browse source 
This partially reverts commit 241c145226.

It embarrassingly included Signal-Desktop changes/tests that it
shouldn't and I somehow noticed it too late... :o Sorry!
This commit is contained in:
Michael Weiss 2021-11-20 17:55:59 +01:00
parent 10eee6abfa
commit be2bc44d0e
No known key found for this signature in database
GPG key ID: 5BE487C4D4771D83
1 changed files with 35 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

35
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View file

@ -10,6 +10,7 @@
, hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" , hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE"
# For a full list of available languages: # For a full list of available languages:
# $ cat pkgs/development/libraries/hunspell/dictionaries.nix | grep "dictFileName =" | awk '{ print $3 }' # $ cat pkgs/development/libraries/hunspell/dictionaries.nix | grep "dictFileName =" | awk '{ print $3 }'
, sqlcipher
}: }:
let let
@ -22,6 +23,39 @@ let
--set HUNSPELL_DICTIONARIES "${hunspellDicts.${hunspellDict}}/share/hunspell" \ --set HUNSPELL_DICTIONARIES "${hunspellDicts.${hunspellDict}}/share/hunspell" \
--set LC_MESSAGES "${spellcheckerLanguage}"''); --set LC_MESSAGES "${spellcheckerLanguage}"'');
sqlcipher-signal = sqlcipher.overrideAttrs (_: {
# Using the same features as the upstream signal sqlcipher build
# https://github.com/signalapp/better-sqlite3/blob/2fa02d2484e9f9a10df5ac7ea4617fb2dff30006/deps/defines.gypi
CFLAGS = [
"-DSQLITE_LIKE_DOESNT_MATCH_BLOBS"
"-DSQLITE_THREADSAFE=2"
"-DSQLITE_USE_URI=0"
"-DSQLITE_DEFAULT_MEMSTATUS=0"
"-DSQLITE_OMIT_DEPRECATED"
"-DSQLITE_OMIT_GET_TABLE"
"-DSQLITE_OMIT_TCL_VARIABLE"
"-DSQLITE_OMIT_PROGRESS_CALLBACK"
"-DSQLITE_OMIT_SHARED_CACHE"
"-DSQLITE_TRACE_SIZE_LIMIT=32"
"-DSQLITE_DEFAULT_CACHE_SIZE=-16000"
"-DSQLITE_DEFAULT_FOREIGN_KEYS=1"
"-DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1"
"-DSQLITE_ENABLE_COLUMN_METADATA"
"-DSQLITE_ENABLE_UPDATE_DELETE_LIMIT"
"-DSQLITE_ENABLE_STAT4"
"-DSQLITE_ENABLE_FTS5"
"-DSQLITE_ENABLE_JSON1"
"-DSQLITE_ENABLE_RTREE"
"-DSQLITE_INTROSPECTION_PRAGMAS"
# SQLCipher-specific options
"-DSQLITE_HAS_CODEC"
"-DSQLITE_TEMP_STORE=2"
"-DSQLITE_SECURE_DELETE"
];
LDFLAGS = [ "-lm" ];
});
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "signal-desktop"; pname = "signal-desktop";
version = "5.23.1"; # Please backport all updates to the stable channel. version = "5.23.1"; # Please backport all updates to the stable channel.
@ -119,6 +153,7 @@ in stdenv.mkDerivation rec {
preFixup = '' preFixup = ''
gappsWrapperArgs+=( gappsWrapperArgs+=(
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }"
--prefix LD_PRELOAD : "${sqlcipher-signal}/lib/libsqlcipher.so"
${customLanguageWrapperArgs} ${customLanguageWrapperArgs}
) )