commit 4684d61e3cfec203f726542102f86d6d533e48e4 · pyrox.dev/nixpkgs

+3 -3

pkgs/by-name/mu/mullvad-browser/package.nix

···

       97
       97
        
           ++ lib.optionals mediaSupport [ ffmpeg ]

     

       98
       98
        
         );

     

       99
       99
        
       

     

       100
       100
       -
         version = "14.0.9";

     

       100
       100
       +
         version = "14.5";

     

       101
       101
        
       

     

       102
       102
        
         sources = {

     

       103
       103
        
           x86_64-linux = fetchurl {

     
···

       109
       109
        
               "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"

     

       110
       110
        
               "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"

     

       111
       111
        
             ];

     

       112
       112
       -
             hash = "sha256-5mVplSTqXVTL+QSJg0hthKUL/JiwX3A3DC869HRzQ7M=";

     

       112
       112
       +
             hash = "sha256-uqwsDXbS8tfG/bgTQKvdiaPzchVhssoQccQStncNWOk=";

     

       113
       113
        
           };

     

       114
       114
        
         };

     

       115
       115
        
       

     
···

       249
       249
        
           # FONTCONFIG_FILE is required to make fontconfig read the MB

     

       250
       250
        
           # fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024

     

       251
       251
        
           # indicates the system fonts.conf being used instead.

     

       252
       252
       -
           FONTCONFIG_FILE=$MB_IN_STORE/fontconfig/fonts.conf

     

       252
       252
       +
           FONTCONFIG_FILE=$MB_IN_STORE/fonts/fonts.conf

     

       253
       253
        
           substituteInPlace "$FONTCONFIG_FILE" \

     

       254
       254
        
             --replace-fail '<dir prefix="cwd">fonts</dir>' "<dir>$MB_IN_STORE/fonts</dir>"

     

       255
       255

+4 -4

pkgs/by-name/to/tor-browser/package.nix

···

       109
       109
        
               ++ lib.optionals mediaSupport [ ffmpeg ]

     

       110
       110
        
             );

     

       111
       111
        
       

     

       112
       112
       -
             version = "14.0.9";

     

       112
       112
       +
             version = "14.5";

     

       113
       113
        
       

     

       114
       114
        
             sources = {

     

       115
       115
        
               x86_64-linux = fetchurl {

     
···

       119
       119
        
                   "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"

     

       120
       120
        
                   "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"

     

       121
       121
        
                 ];

     

       122
       122
       -
                 hash = "sha256-oTOTTB5tuAhzaQY3nlSUD4lZNHAGmURIf5XCzFB2xeg=";

     

       122
       122
       +
                 hash = "sha256-wSxmNPPJsLRjDVimc2Rp1rBcIgYp/CtPKuU6+gZfVmw=";

     

       123
       123
        
               };

     

       124
       124
        
       

     

       125
       125
        
               i686-linux = fetchurl {

     
···

       129
       129
        
                   "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"

     

       130
       130
        
                   "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"

     

       131
       131
        
                 ];

     

       132
       132
       -
                 hash = "sha256-Z/CDaO5eEPVwBnm3SJxBYvInyB7Oy6Ve8hNJunTJET0=";

     

       132
       132
       +
                 hash = "sha256-upqpWUl5qmDj7Oc/wIGdNlgIJSaTbhxlq4X+zjCPHfA=";

     

       133
       133
        
               };

     

       134
       134
        
             };

     

       135
       135
        
       

     
···

       291
       291
        
               # FONTCONFIG_FILE is required to make fontconfig read the TBB

     

       292
       292
        
               # fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024

     

       293
       293
        
               # indicates the system fonts.conf being used instead.

     

       294
       294
       -
               FONTCONFIG_FILE=$TBB_IN_STORE/fontconfig/fonts.conf

     

       294
       294
       +
               FONTCONFIG_FILE=$TBB_IN_STORE/fonts/fonts.conf

     

       295
       295
        
               substituteInPlace "$FONTCONFIG_FILE" \

     

       296
       296
        
                 --replace-fail '<dir prefix="cwd">fonts</dir>' "<dir>$TBB_IN_STORE/fonts</dir>"

     

       297
       297