diff options
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/librewolf.scm | 11 | ||||
| -rw-r--r-- | gnu/packages/patches/librewolf-use-system-wide-dir.patch | 37 |
2 files changed, 47 insertions, 1 deletions
diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm index 42d212e9f9..42bae0fbc0 100644 --- a/gnu/packages/librewolf.scm +++ b/gnu/packages/librewolf.scm @@ -188,7 +188,11 @@ (invoke "make" "all") (copy-file (string-append "librewolf-" #$version ".source.tar.gz") - #$output)))))))) + #$output))))) + (patches + (search-patches + "torbrowser-compare-paths.patch" + "librewolf-use-system-wide-dir.patch"))))) ;; Define the versions of rust needed to build librewolf, trying to match ;; upstream. See the file taskcluster/ci/toolchain/rust.yml at @@ -705,6 +709,11 @@ rust-cbindgen-0.26 which yasm)) + (native-search-paths + (list (search-path-specification + (variable "ICECAT_SYSTEM_DIR") + (separator #f) ;single entry + (files '("lib/icecat"))))) (home-page "https://librewolf.net/") (synopsis "Custom version of Firefox, focused on privacy, security and freedom") diff --git a/gnu/packages/patches/librewolf-use-system-wide-dir.patch b/gnu/packages/patches/librewolf-use-system-wide-dir.patch new file mode 100644 index 0000000000..c8a4d8cb12 --- /dev/null +++ b/gnu/packages/patches/librewolf-use-system-wide-dir.patch @@ -0,0 +1,37 @@ +Replace "/usr/lib/librewolf" (the system-wide directory for extensions and +native manifests) with "$ICECAT_SYSTEM_DIR". + +diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp +index 0cbc825738..5c0bf6ae7f 100644 +--- a/toolkit/xre/nsXREDirProvider.cpp ++++ b/toolkit/xre/nsXREDirProvider.cpp +@@ -280,25 +280,11 @@ nsresult nsXREDirProvider::GetBackgroundTasksProfilesRootDir( + static nsresult GetSystemParentDirectory(nsIFile** aFile) { + nsresult rv; + nsCOMPtr<nsIFile> localDir; +-# if defined(XP_MACOSX) +- rv = GetOSXFolderType(kOnSystemDisk, kApplicationSupportFolderType, +- getter_AddRefs(localDir)); +- if (NS_SUCCEEDED(rv)) { +- rv = localDir->AppendNative("LibreWolf"_ns); +- } +-# else +- constexpr auto dirname = +-# ifdef HAVE_USR_LIB64_DIR +- "/usr/lib64/librewolf"_ns +-# elif defined(__OpenBSD__) || defined(__FreeBSD__) +- "/usr/local/lib/librewolf"_ns +-# else +- "/usr/lib/librewolf"_ns +-# endif +- ; +- rv = NS_NewNativeLocalFile(dirname, getter_AddRefs(localDir)); +-# endif ++ const char* systemParentDir = getenv("ICECAT_SYSTEM_DIR"); ++ if (!systemParentDir || !*systemParentDir) return NS_ERROR_FAILURE; + ++ rv = NS_NewNativeLocalFile(nsDependentCString(systemParentDir), ++ getter_AddRefs(localDir)); + if (NS_SUCCEEDED(rv)) { + localDir.forget(aFile); + } |