commit 3c928233e0acecbb1f6bc2c3d6b12cf78090e4ca · pyrox.dev/nixpkgs

+15 -5
pkgs/tools/security/bitwarden/default.nix
···

       5
       5
        
       , dbus

     

       6
       6
        
       , electron_25

     

       7
       7
        
       , fetchFromGitHub

     

       8
       8
       +
       , fetchpatch2

     

       8
       9
        
       , glib

     

       9
       10
        
       , gnome

     

       10
       11
        
       , gtk3

     
···

       27
       28
        
         electron = electron_25;

     

       28
       29
        
       in buildNpmPackage rec {

     

       29
       30
        
         pname = "bitwarden";

     

       30
       30
       -
         version = "2023.10.0";

     

       31
       31
       +
         version = "2023.10.1";

     

       31
       32
        
       

     

       32
       33
        
         src = fetchFromGitHub {

     

       33
       34
        
           owner = "bitwarden";

     

       34
       35
        
           repo = "clients";

     

       35
       36
        
           rev = "desktop-v${version}";

     

       36
       36
       -
           hash = "sha256-egXToXWfb9XV7JuCRBYJO4p/e+WOwMncPKz0oBgeALQ=";

     

       37
       37
       +
           hash = "sha256-cwSIMN40d1ySUSxBl8jXLVndnJJvPnLiTxkYnA3Pqws=";

     

       37
       38
        
         };

     

       38
       39
        
       

     

       40
       40
       +
         patches = [

     

       41
       41
       +
           (fetchpatch2 {

     

       42
       42
       +
             # https://github.com/bitwarden/clients/issues/6812#issuecomment-1806830091

     

       43
       43
       +
             url = "https://github.com/solopasha/bitwarden_flatpak/raw/daec07b067b9cec5e260b44a53216fc65866ba1d/wayland-clipboard.patch";

     

       44
       44
       +
             hash = "sha256-hcaRa9Nl7MYaTNwmB5Qdm65Mtufv3z+IPwLDPiO3pcw=";

     

       45
       45
       +
           })

     

       46
       46
       +
         ];

     

       47
       47
       +
       

     

       39
       48
        
         nodejs = nodejs_18;

     

       40
       49
        
       

     

       41
       50
        
         makeCacheWritable = true;

     

       42
       51
        
         npmWorkspace = "apps/desktop";

     

       43
       43
       -
         npmDepsHash = "sha256-iO8ZozVl1vOOqowQARnRJWSFUFnau46+dKfcMSkyU3o=";

     

       52
       52
       +
         npmDepsHash = "sha256-KN8C9Y0tfhHVagk+CUMpI/bIRChhzxC9M27HkU4aTEc=";

     

       44
       53
        
       

     

       45
       54
        
         cargoDeps = rustPlatform.fetchCargoTarball {

     

       46
       55
        
           name = "${pname}-${version}";

     

       47
       47
       -
           inherit src;

     

       56
       56
       +
           inherit patches src;

     

       57
       57
       +
           patchFlags = [ "-p4" ];

     

       48
       58
        
           sourceRoot = "${src.name}/${cargoRoot}";

     

       49
       49
       -
           hash = "sha256-I7wENo4cCxcllEyT/tgAavHNwYPrQkPXxg/oTsl/ClA=";

     

       59
       59
       +
           hash = "sha256-AmtdmOR3aZJTZiFbkwRXjeTOJdcN40bTmWx4Ss3JNJ8=";

     

       50
       60
        
         };

     

       51
       61
        
         cargoRoot = "apps/desktop/desktop_native";

     

       52
       62