Robert Schütz
2025-01-25 10:02:31 -08:00
parent c7d980a73e
commit 2be3693b86
+14 -6
View File
@@ -9,7 +9,7 @@
}:
let
version = "2024.6.2c";
version = "2025.1.1";
suffix = lib.head (lib.match "[0-9.]*([a-z]*)" version);
@@ -17,7 +17,7 @@ let
owner = "dani-garcia";
repo = "bw_web_builds";
rev = "v${version}";
hash = "sha256-Gd8yQx9j6ieUvaM6IPSELNRy83y0cBkBwLYMqk8OIjU=";
hash = "sha256-wQGpl7N0D83FrrV4T+LFe9h3n5Q/MqLbGGO2F5R9k2g=";
};
in
@@ -29,10 +29,10 @@ buildNpmPackage rec {
owner = "bitwarden";
repo = "clients";
rev = "web-v${lib.removeSuffix suffix version}";
hash = "sha256-HMQ0oQ04WkLlUgsYt6ZpcziDq05mnSA0+VnJCpteceg=";
hash = "sha256-Bq133V8CsDMnLeaKrW5JmLTGRaZVLRbp+tTgG725tqE=";
};
npmDepsHash = "sha256-zMzQEM5mV14gewzYhy1F2bNEugXjZSOviYwYVV2Cb8c=";
npmDepsHash = "sha256-bWcp3VJI2bObLH/XBx3cdxXQY9Cw+IFpeNA2TXVTtFg=";
postPatch = ''
ln -s ${bw_web_builds}/{patches,resources} ..
@@ -41,12 +41,20 @@ buildNpmPackage rec {
'';
nativeBuildInputs = [
(python3.withPackages (ps: [ ps.setuptools ]))
python3
];
makeCacheWritable = true;
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
env = {
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
npm_config_build_from_source = "true";
};
npmRebuildFlags = [
# FIXME one of the esbuild versions fails to download @esbuild/linux-x64
"--ignore-scripts"
];
npmBuildScript = "dist:oss:selfhost";