···11-diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/cmd/shlibsign/shlibsign.c nss/cmd/shlibsign/shlibsign.c
22---- nss/cmd/shlibsign/shlibsign.c 2017-01-04 15:24:24.000000000 +0100
33-+++ nss/cmd/shlibsign/shlibsign.c 2017-01-24 14:43:31.030420852 +0100
44-@@ -875,6 +875,8 @@
55- goto cleanup;
66- }
77- lib = PR_LoadLibrary(libname);
88-+ if (!lib)
99-+ lib = PR_LoadLibrary(NIX_NSS_LIBDIR"libsoftokn3.so");
1010- assert(lib != NULL);
1111- if (!lib) {
1212- PR_fprintf(PR_STDERR, "loading softokn3 failed");
1313-diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/coreconf/config.mk nss/coreconf/config.mk
1414---- nss/coreconf/config.mk 2017-01-04 15:24:24.000000000 +0100
1515-+++ nss/coreconf/config.mk 2017-01-24 14:43:47.989432372 +0100
1616-@@ -202,3 +202,6 @@
1717-1818- # Hide old, deprecated, TLS cipher suite names when building NSS
1919- DEFINES += -DSSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES
2020-+
2121-+# Nix specific stuff.
2222-+DEFINES += -DNIX_NSS_LIBDIR=\"$(out)/lib/\"
2323-diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/lib/pk11wrap/pk11load.c nss/lib/pk11wrap/pk11load.c
2424---- nss/lib/pk11wrap/pk11load.c 2017-01-04 15:24:24.000000000 +0100
2525-+++ nss/lib/pk11wrap/pk11load.c 2017-01-24 14:45:06.883485652 +0100
2626-@@ -440,6 +440,13 @@
2727- * unload the library if anything goes wrong from here on out...
2828- */
2929- library = PR_LoadLibrary(mod->dllName);
3030-+ if ((library == NULL) &&
3131-+ !rindex(mod->dllName, PR_GetDirectorySeparator())) {
3232-+ library = PORT_LoadLibraryFromOrigin(my_shlib_name,
3333-+ (PRFuncPtr) &softoken_LoadDSO,
3434-+ mod->dllName);
3535-+ }
3636-+
3737- mod->library = (void *)library;
3838-3939- if (library == NULL) {
4040-diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/lib/util/secload.c nss/lib/util/secload.c
4141---- nss/lib/util/secload.c 2017-01-04 15:24:24.000000000 +0100
4242-+++ nss/lib/util/secload.c 2017-01-24 14:43:31.030420852 +0100
4343-@@ -70,9 +70,14 @@
4444-4545- /* Remove the trailing filename from referencePath and add the new one */
4646- c = strrchr(referencePath, PR_GetDirectorySeparator());
4747-+ if (!c) { /* referencePath doesn't contain a / means that dladdr gave us argv[0]
4848-+ * and program was called from $PATH. Hack to get libs from NIX_NSS_LIBDIR */
4949-+ referencePath = NIX_NSS_LIBDIR;
5050-+ c = (char*) &referencePath[sizeof(NIX_NSS_LIBDIR) - 1]; /* last / */
5151-+ }
5252- if (c) {
5353- size_t referencePathSize = 1 + c - referencePath;
5454-- fullName = (char*)PORT_Alloc(strlen(name) + referencePathSize + 1);
5555-+ fullName = (char*) PORT_Alloc(strlen(name) + referencePathSize + 5);
5656- if (fullName) {
5757- memcpy(fullName, referencePath, referencePathSize);
5858- strcpy(fullName + referencePathSize, name);
5959-@@ -82,6 +87,11 @@
6060- #endif
6161- libSpec.type = PR_LibSpec_Pathname;
6262- libSpec.value.pathname = fullName;
6363-+ if ((referencePathSize >= 4) &&
6464-+ (strncmp(fullName + referencePathSize - 4, "bin", 3) == 0)) {
6565-+ memcpy(fullName + referencePathSize -4, "lib", 3);
6666-+ }
6767-+ strcpy(fullName + referencePathSize, name);
6868- dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL
6969- #ifdef PR_LD_ALT_SEARCH_PATH
7070- /* allow library's dependencies to be found in the same directory
7171-@@ -89,6 +99,10 @@
7272- | PR_LD_ALT_SEARCH_PATH
7373- #endif
7474- );
7575-+ if (! dlh) {
7676-+ strcpy(fullName + referencePathSize, name);
7777-+ dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL);
7878-+ }
7979- PORT_Free(fullName);
8080- }
8181- }
+2
pkgs/top-level/aliases.nix
···670670 rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02
671671 rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02
672672 subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # added 2021-03-31
673673+ thunderbird-68 = throw "Thunderbird 68 reached end of life with its final release 68.12.0 on 2020-08-25 and was therefore removed from nixpkgs";
674674+ thunderbird-bin-68 = throw "Thunderbird 68 reached end of life with its final release 68.12.0 on 2020-08-25 and was therefore removed from nixpkgs";
673675 togglesg-download = throw "togglesg-download was removed 2021-04-30 as it's unmaintained";
674676 urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # added 2020-02-02
675677 urxvt_perl = rxvt-unicode-plugins.perl; # added 2020-02-02