diff --git a/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix b/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix index 86f8e1260ecd..4eaa532ebe08 100644 --- a/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix +++ b/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix @@ -1,4 +1,4 @@ -{ callPackage }: +{ callPackage, runCommand }: let src = callPackage ./src.nix { }; in @@ -32,10 +32,6 @@ rec { sed -i '/# This must remain last./i gkrust_features += ["glean_disable_upload"]\'$'\n' toolkit/library/rust/gkrust-features.mozbuild - # Temporary fix used with patches/rust-build.patch - sed -i 's/9456ca46168ef86c98399a2536f577ef7be3cdde90c0c51392d8ac48519d3fae/60cd124908737068ab21c7773b3df71d00e186cd605f15bad9977232830aabc0/g' third_party/rust/encoding_rs/.cargo-checksum.json - sed -i 's/d7405d2bcf99cf9729075473c45f677630f4c1947c8ba9757db607f2025a7da2/a066ad881d5a74386e666fc844f7fecbbd70021d0330c1b08a2d7a2a67437ccf/g' third_party/rust/encoding_rs/.cargo-checksum.json - cp ${source}/patches/pref-pane/category-librewolf.svg browser/themes/shared/preferences cp ${source}/patches/pref-pane/librewolf.css browser/themes/shared/preferences cp ${source}/patches/pref-pane/librewolf.inc.xhtml browser/components/preferences @@ -55,7 +51,16 @@ rec { done ''; - extraPrefsFiles = [ "${source}/settings/librewolf.cfg" ]; + localSettingsPrefs = runCommand "local-settings.js" { } '' + # Import of `librewolf.cfg` file is already being done manually. + substitute ${source}/settings/defaults/pref/local-settings.js $out \ + --replace-fail 'pref("general.config.filename", "librewolf.cfg");' "" + ''; + + extraPrefsFiles = [ + "${source}/settings/librewolf.cfg" + localSettingsPrefs + ]; extraPoliciesFiles = [ "${source}/settings/distribution/policies.json" ]; diff --git a/pkgs/by-name/li/librewolf-unwrapped/src.json b/pkgs/by-name/li/librewolf-unwrapped/src.json index 9a43743f60aa..afde3b780190 100644 --- a/pkgs/by-name/li/librewolf-unwrapped/src.json +++ b/pkgs/by-name/li/librewolf-unwrapped/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "150.0.3-1", + "packageVersion": "151.0.1-2", "source": { - "rev": "150.0.3-1", - "hash": "sha256-ScwnfmK2zUFQLoy1Z9P9xQ2iTss2ufbzji/IHJSri9U=" + "rev": "151.0.1-2", + "hash": "sha256-6C048VV6NECGTcdGla4qIa88z677ZTjORf5FM0a4xMM=" }, "firefox": { - "version": "150.0.3", - "hash": "sha512-hFLaYSAPjuZnkNP/8jDKhLKskpGvK1fgGEhsUPk4xTxvtJQ/5s/h6ZuXg0ZvsAv3B/oAYpN1OsaYYY/B47cKSg==" + "version": "151.0.1", + "hash": "sha512-hJKhu5VrODcxU5OL0YsOGOOkrQ0qvCAXtF4CvCdoyPRo1cBjKaMkhaA6Z7ucIhAuar/x5zCAx3dkc11DDcdydw==" } }