commit ff37de0c4a697f0750b0a7447c1ce82ba4b4d672 · pyrox.dev/nixpkgs

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

       1
       1
        
       { lib

     

       2
       2
       +
       , applyPatches

     

       2
       3
        
       , buildNpmPackage

     

       3
       4
        
       , dbus

     

       4
       4
       -
       , electron

     

       5
       5
       +
       , electron_24

     

       5
       6
        
       , fetchFromGitHub

     

       7
       7
       +
       , fetchpatch

     

       6
       8
        
       , glib

     

       7
       9
        
       , gnome

     

       8
       10
        
       , gtk3

     
···

       11
       13
        
       , makeDesktopItem

     

       12
       14
        
       , makeWrapper

     

       13
       15
        
       , moreutils

     

       14
       14
       -
       , nodejs_16

     

       16
       16
       +
       , nodejs_18

     

       15
       17
        
       , pkg-config

     

       16
       18
        
       , python3

     

       17
       19
        
       , rustPlatform

     
···

       22
       24
        
         description = "A secure and free password manager for all of your devices";

     

       23
       25
        
         icon = "bitwarden";

     

       24
       26
        
       

     

       25
       25
       -
         buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_16; };

     

       27
       27
       +
         buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; };

     

       28
       28
       +
         electron = electron_24;

     

       26
       29
        
       

     

       27
       27
       -
         version = "2023.3.2";

     

       28
       28
       -
         src = fetchFromGitHub {

     

       29
       29
       -
           owner = "bitwarden";

     

       30
       30
       -
           repo = "clients";

     

       31
       31
       -
           rev = "desktop-v${version}";

     

       32
       32
       -
           sha256 = "sha256-KQDM7XDUA+yRv8y1K//rMCs4J36df42RVsiAXazJeYQ=";

     

       30
       30
       +
         version = "2023.4.0";

     

       31
       31
       +
         src = applyPatches {

     

       32
       32
       +
           src = fetchFromGitHub {

     

       33
       33
       +
             owner = "bitwarden";

     

       34
       34
       +
             repo = "clients";

     

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

     

       36
       36
       +
             sha256 = "sha256-TTKDl6Py3k+fAy/kcyiMbAAKQdhVnZTyRXV8D/VpKBE=";

     

       37
       37
       +
           };

     

       38
       38
       +
       

     

       39
       39
       +
           patches = [

     

       40
       40
       +
             # Bump electron to 24 and node to 18

     

       41
       41
       +
             (fetchpatch {

     

       42
       42
       +
               url = "https://github.com/bitwarden/clients/pull/5205.patch";

     

       43
       43
       +
               hash = "sha256-sKSrh8RHXtxGczyZScjTeiGZgTZCQ7f45ULj/j9cp6M=";

     

       44
       44
       +
             })

     

       45
       45
       +
           ];

     

       33
       46
        
         };

     

       34
       47
        
       

     

       35
       48
        
         desktop-native = rustPlatform.buildRustPackage {

     

       36
       49
        
           pname = "bitwarden-desktop-native";

     

       37
       50
        
           inherit src version;

     

       38
       38
       -
           sourceRoot = "source/apps/desktop/desktop_native";

     

       39
       39
       -
           cargoSha256 = "sha256-XsAmVYWPPnY0cgBzpO2aWx/fh85fKr8kMO98cDMzOKk=";

     

       40
       40
       -
       

     

       41
       41
       -
           patchFlags = [ "-p4" ];

     

       51
       51
       +
           sourceRoot = "source-patched/apps/desktop/desktop_native";

     

       52
       52
       +
           cargoSha256 = "sha256-VW9DmSh9jvqFCZjH1SAYkydSGjXSVEbv4CmtoJBiw5Y=";

     

       42
       53
        
       

     

       43
       54
        
           nativeBuildInputs = [

     

       44
       55
        
             pkg-config

     
···

       91
       102
        
         npmBuildFlags = [

     

       92
       103
        
           "--workspace apps/desktop"

     

       93
       104
        
         ];

     

       94
       94
       -
         npmDepsHash = "sha256-RmkTWhakZstCCMLQ3iJ8KD5Yt5ZafXc8NDgncJMLaxs=";

     

       105
       105
       +
         npmDepsHash = "sha256-UXDn09qyM8GwfUiWLDhhyrGFZeKtTRmQArstw+tm5iE=";

     

       95
       106
        
       

     

       96
       107
        
         ELECTRON_SKIP_BINARY_DOWNLOAD = "1";

     

       97
       108
        
       

     
···

       103
       114
        
         ];

     

       104
       115
        
       

     

       105
       116
        
         preBuild = ''

     

       117
       117
       +
           if [[ $(jq --raw-output '.devDependencies.electron' < package.json | grep -E --only-matching '^[0-9]+') != ${lib.escapeShellArg (lib.versions.major electron.version)} ]]; then

     

       118
       118
       +
             echo 'ERROR: electron version mismatch'

     

       119
       119
       +
             exit 1

     

       120
       120
       +
           fi

     

       121
       121
       +
       

     

       106
       122
        
           jq 'del(.scripts.postinstall)' apps/desktop/package.json | sponge apps/desktop/package.json

     

       107
       123
        
           jq '.scripts.build = ""' apps/desktop/desktop_native/package.json | sponge apps/desktop/desktop_native/package.json

     

       108
       124
        
           cp ${desktop-native}/lib/libdesktop_native.so apps/desktop/desktop_native/desktop_native.linux-x64-musl.node

     
···

       111
       127
        
         postBuild = ''

     

       112
       128
        
           pushd apps/desktop

     

       113
       129
        
       

     

       114
       114
       -
           "$(npm bin)"/electron-builder \

     

       130
       130
       +
           npm exec electron-builder -- \

     

       115
       131
        
             --dir \

     

       116
       132
        
             -c.electronDist=${electron}/lib/electron \

     

       117
       133
        
             -c.electronVersion=${electron.version}