insulator2: migrate to fixup-yarn-lock & fix build

This commit is contained in:
Felix Buehler
2024-10-14 22:33:15 +02:00
parent 1bbd47ee0a
commit 39395463cd
2 changed files with 24 additions and 9 deletions
+4 -4
View File
@@ -4562,9 +4562,9 @@ dependencies = [
[[package]]
name = "time"
version = "0.1.45"
version = "0.3.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
dependencies = [
"libc",
"wasi 0.10.0+wasi-snapshot-preview1",
@@ -4591,9 +4591,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
[[package]]
name = "time-macros"
version = "0.2.9"
version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b"
checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
dependencies = [
"time-core",
]
+20 -5
View File
@@ -1,4 +1,5 @@
{ lib
, cmake
, dbus
, fetchFromGitHub
, fetchYarnDeps
@@ -11,7 +12,6 @@
, perl
, cyrus_sasl
, stdenv
, fixup_yarn_lock
, yarnConfigHook
, nodejs-slim
, cargo-tauri
@@ -20,6 +20,7 @@
, rustc
, jq
, moreutils
, fetchpatch
}:
stdenv.mkDerivation rec {
@@ -30,9 +31,18 @@ stdenv.mkDerivation rec {
owner = "andrewinci";
repo = pname;
rev = "v${version}";
hash = "sha256-Bi9GCQr7yox5Plc7o0svRKYi1XoK/HDGj1VbW1z4jac=";
hash = "sha256-34JRIB7/x7miReWOxR/m+atjfUiE3XGyh9OBSbMg3m4=";
};
patches = [
# see: https://github.com/andrewinci/insulator2/pull/733
(fetchpatch {
name = "fix-rust-1.80.0";
url = "https://github.com/andrewinci/insulator2/commit/7dbff0777c4364eec68cf90488d99f06b11dfa98.patch";
hash = "sha256-P8rBufYpREP5tOO9vSymvms4f2JbsUEjK7/yn9P7gYk=";
})
];
# Yarn *really* wants us to use corepack if this is set
postPatch = ''
jq 'del(.packageManager)' package.json | sponge package.json
@@ -54,16 +64,22 @@ stdenv.mkDerivation rec {
};
cargoRoot = "backend/";
buildAndTestDir = cargoRoot;
buildAndTestSubdir = cargoRoot;
dontUseCmakeConfigure = true;
preInstall = ''
mkdir -p "$out"
'';
nativeBuildInputs = [
cmake
pkg-config
perl
rustPlatform.cargoSetupHook
cargo
rustc
cargo-tauri.hook
fixup_yarn_lock
yarnConfigHook
nodejs-slim
cyrus_sasl
@@ -87,5 +103,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ tc-kaluza ];
mainProgram = "insulator-2";
};
}