diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2021-11-20 17:54:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-20 17:54:51 +0100 |
| commit | 4f3b9ca7315f5d510fe6627d32f2c46f963f635f (patch) | |
| tree | 0f304a4ccf794c17e61165d6b35b57d7c709dbc5 | |
| parent | Merge pull request #146768 from primeos/chromiumDev (diff) | |
| download | nixpkgs-origin/revert-146768-chromiumDev.tar.gz | |
Revert "chromiumDev: 97.0.4692.20 -> 98.0.4710.4"origin/revert-146768-chromiumDev
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/upstream-info.json | 12 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/signal-desktop/default.nix | 35 |
2 files changed, 41 insertions, 6 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 4e7149ec1ee5..030ef5e00a52 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,15 +31,15 @@ } }, "dev": { - "version": "98.0.4710.4", - "sha256": "0ay4bn9963k7bbv31wfc1iy2z6n6jjk1h2mn7m7893i81raisk8m", - "sha256bin64": "0n4kb6iiv9aih7yzrnr9m7znqb2p37grlj8by6gpjfikx3fxf5gg", + "version": "97.0.4692.20", + "sha256": "1njgfz3kz1pyyaaskqc47ldy2gzc3c9a8mjib81nalzrqbmd3372", + "sha256bin64": "06vsmzz8nvmx7hfqwvqfmq4h000dw22srxdrgrdfgh7mry0yvf4a", "deps": { "gn": { - "version": "2021-11-16", + "version": "2021-11-03", "url": "https://gn.googlesource.com/gn", - "rev": "4aa9bdfa05b688c58d3d7d3e496f3f18cbb3d89e", - "sha256": "0jwjfbxlbqxlz7wm46vyrxn3pgwyyd03as6gy5mcvvk9aialqh9f" + "rev": "90294ccdcf9334ed25a76ac9b67689468e506342", + "sha256": "0n0jml8s00ayy186jzrf207hbz70pxiq426znxwxd4gjcp60scsa" } } }, diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 14de83785434..c8797423bedb 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -10,6 +10,7 @@ , hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" # For a full list of available languages: # $ cat pkgs/development/libraries/hunspell/dictionaries.nix | grep "dictFileName =" | awk '{ print $3 }' +, sqlcipher }: let @@ -22,6 +23,39 @@ let --set HUNSPELL_DICTIONARIES "${hunspellDicts.${hunspellDict}}/share/hunspell" \ --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 { pname = "signal-desktop"; version = "5.23.1"; # Please backport all updates to the stable channel. @@ -119,6 +153,7 @@ in stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" + --prefix LD_PRELOAD : "${sqlcipher-signal}/lib/libsqlcipher.so" ${customLanguageWrapperArgs} ) |