commit f17f4f51389b3e1b2b96f51c525fade47dd39501 · pyrox.dev/nixpkgs

+2 -1

pkgs/applications/networking/browsers/librewolf/default.nix

···

       9
       9
        
       let

     

       10
       10
        
         librewolf-src = callPackage ./librewolf.nix { };

     

       11
       11
        
       in

     

       12
       12
       -
       (buildMozillaMach rec {

     

       12
       12
       +
       (buildMozillaMach {

     

       13
       13
        
         pname = "librewolf";

     

       14
       14
        
         applicationName = "LibreWolf";

     

       15
       15
        
         binaryName = "librewolf";

     
···

       31
       31
        
           maintainers = with lib.maintainers; [

     

       32
       32
        
             squalus

     

       33
       33
        
             dwrege

     

       34
       34
       +
             fpletz

     

       34
       35
        
           ];

     

       35
       36
        
           platforms = lib.platforms.unix;

     

       36
       37
        
           broken = stdenv.buildPlatform.is32bit;

+16 -6

pkgs/applications/networking/browsers/librewolf/librewolf.nix

···

       10
       10
        
       

     

       11
       11
        
         extraConfigureFlags = [

     

       12
       12
        
           "--with-unsigned-addon-scopes=app,system"

     

       13
       13
       +
           "--disable-default-browser-agent"

     

       13
       14
        
         ];

     

       14
       15
        
       

     

       15
       16
        
         extraPostPatch = ''

     

       16
       17
        
           while read patch_name; do

     

       17
       17
       -
             if ! sed -n '/nvidia-wayland-backported-fixes-.*-Bug-1898476/p'; then

     

       18
       18
       -
               echo "applying LibreWolf patch: $patch_name"

     

       19
       19
       -
               patch -p1 < ${source}/$patch_name

     

       20
       20
       -
             fi

     

       18
       18
       +
             echo "applying LibreWolf patch: $patch_name"

     

       19
       19
       +
             patch -p1 < ${source}/$patch_name

     

       21
       20
        
           done <${source}/assets/patches.txt

     

       22
       21
        
       

     

       23
       22
        
           cp -r ${source}/themes/browser .

     

       24
       23
        
           cp ${source}/assets/search-config.json services/settings/dumps/main/search-config.json

     

       25
       24
        
           sed -i '/MOZ_SERVICES_HEALTHREPORT/ s/True/False/' browser/moz.configure

     

       26
       26
       -
           sed -i '/MOZ_NORMANDY/ s/True/False/' browser/moz.configure

     

       27
       25
        
       

     

       28
       26
        
           cp ${source}/patches/pref-pane/category-librewolf.svg browser/themes/shared/preferences

     

       29
       27
        
           cp ${source}/patches/pref-pane/librewolf.css browser/themes/shared/preferences

     

       30
       28
        
           cp ${source}/patches/pref-pane/librewolf.inc.xhtml browser/components/preferences

     

       31
       29
        
           cp ${source}/patches/pref-pane/librewolf.js browser/components/preferences

     

       32
       32
       -
           cat ${source}/browser/preferences/preferences.ftl >> browser/locales/en-US/browser/preferences/preferences.ftl

     

       30
       30
       +
       

     

       31
       31
       +
           # override firefox version

     

       32
       32
       +
           for fn in browser/config/version.txt browser/config/version_display.txt; do

     

       33
       33
       +
             echo "${packageVersion}" > "$fn"

     

       34
       34
       +
           done

     

       35
       35
       +
       

     

       36
       36
       +
           echo "patching appstrings.properties"

     

       37
       37
       +
           find . -path '*/appstrings.properties' -exec sed -i s/Firefox/LibreWolf/ {} \;

     

       38
       38
       +
       

     

       39
       39
       +
           for fn in $(find "${source}/l10n/en-US/browser" -type f -name '*.inc.ftl'); do

     

       40
       40
       +
             target_fn=$(echo "$fn" | sed "s,${source}/l10n,browser/locales," | sed "s,\.inc\.ftl$,.ftl,")

     

       41
       41
       +
             cat "$fn" >> "$target_fn"

     

       42
       42
       +
           done

     

       33
       43
        
         '';

     

       34
       44
        
       

     

       35
       45
        
         extraPrefsFiles = [ "${source}/settings/librewolf.cfg" ];

+3 -3

pkgs/applications/networking/browsers/librewolf/src.json

···

       1
       1
        
       {

     

       2
       2
       -
         "packageVersion": "136.0-1",

     

       2
       2
       +
         "packageVersion": "136.0-2",

     

       3
       3
        
         "source": {

     

       4
       4
       -
           "rev": "136.0-1",

     

       5
       5
       -
           "hash": "sha256-ELxcS33lYgYcBUjpfDBMGZfeWanUzcUb3gXI2kEE7O0="

     

       4
       4
       +
           "rev": "136.0-2",

     

       5
       5
       +
           "hash": "sha256-X5DkaqqwZF4piRg/KPoV/SS1DtDG6AqR89UeWqFxZX0="

     

       6
       6
        
         },

     

       7
       7
        
         "firefox": {

     

       8
       8
        
           "version": "136.0",