mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-03 21:40:12 +00:00
chiri: remove pnpm patch (#563248)
This commit is contained in:
nixpkgs-ci[bot]
@@ -22,122 +22,107 @@
|
||||
webkitgtk_4_1,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (
|
||||
finalAttrs:
|
||||
let
|
||||
# on macOS, Node.js worker threads default to `trackUnmanagedFds: true`
|
||||
# when used with pnpm's graceful-fs EAGAIN retry loop, this causes file descriptor
|
||||
# churn that leads to a crash during cleanup (presenting as `Killed: 9` / SIGKILL)
|
||||
# within the Nix sandbox. so we just disable `trackUnmanagedFds` to prevent this
|
||||
# see: https://github.com/NixOS/nixpkgs/issues/525627
|
||||
pnpm-patched = pnpm_11.overrideAttrs (old: {
|
||||
postPatch = (old.postPatch or "") + ''
|
||||
substituteInPlace dist/pnpm.mjs \
|
||||
--replace-fail \
|
||||
'resourceLimits: this._workerResourceLimits' \
|
||||
'resourceLimits: this._workerResourceLimits, trackUnmanagedFds: false'
|
||||
'';
|
||||
});
|
||||
in
|
||||
{
|
||||
pname = "chiri";
|
||||
version = "1.0.0";
|
||||
let
|
||||
pnpm = pnpm_11;
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "chiri";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chiriapp";
|
||||
repo = "chiri";
|
||||
tag = "app-v${finalAttrs.version}";
|
||||
hash = "sha256-ASmDHMlp+jNA/8uJ78SLv/2plG41KYkKdel2WpMGwq8=";
|
||||
};
|
||||
src = fetchFromGitHub {
|
||||
owner = "chiriapp";
|
||||
repo = "chiri";
|
||||
tag = "app-v${finalAttrs.version}";
|
||||
hash = "sha256-ASmDHMlp+jNA/8uJ78SLv/2plG41KYkKdel2WpMGwq8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-BeEpTFKWr81vNBUhHOnfrJ/yNgpZGDExnaxvIbwkBMs=";
|
||||
cargoHash = "sha256-BeEpTFKWr81vNBUhHOnfrJ/yNgpZGDExnaxvIbwkBMs=";
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm-patched;
|
||||
hash = "sha256-IQgYbkGsPC0TbqcDxhOgVWFmpxprCCwrQI7QJx4IpAc=";
|
||||
fetcherVersion = 4;
|
||||
};
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
inherit pnpm;
|
||||
hash = "sha256-IQgYbkGsPC0TbqcDxhOgVWFmpxprCCwrQI7QJx4IpAc=";
|
||||
fetcherVersion = 4;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo-tauri.hook
|
||||
nodejs_26
|
||||
pnpmConfigHook
|
||||
pnpm-patched
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
wrapGAppsHook4
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
makeBinaryWrapper
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
cargo-tauri.hook
|
||||
nodejs_26
|
||||
pkg-config
|
||||
pnpm
|
||||
pnpmConfigHook
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
wrapGAppsHook4
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
makeBinaryWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
glib-networking
|
||||
libayatana-appindicator
|
||||
webkitgtk_4_1
|
||||
];
|
||||
buildInputs = [
|
||||
openssl
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
glib-networking
|
||||
libayatana-appindicator
|
||||
webkitgtk_4_1
|
||||
];
|
||||
|
||||
cargoRoot = "src-tauri";
|
||||
buildAndTestSubdir = "src-tauri";
|
||||
cargoRoot = "src-tauri";
|
||||
buildAndTestSubdir = "src-tauri";
|
||||
|
||||
postPatch =
|
||||
lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
for libappindicatorRs in $cargoDepsCopy/*/libappindicator-sys-*/src/lib.rs; do
|
||||
if [[ -f "$libappindicatorRs" ]]; then
|
||||
substituteInPlace "$libappindicatorRs" \
|
||||
--replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
|
||||
fi
|
||||
done
|
||||
''
|
||||
+ ''
|
||||
substituteInPlace src-tauri/tauri.conf.json \
|
||||
--replace-fail '"createUpdaterArtifacts": true' '"createUpdaterArtifacts": false'
|
||||
'';
|
||||
|
||||
# This is needed since the signing keys are private, and are only used in CI during releases anyways. Regular users won't need this.
|
||||
preBuild = ''
|
||||
unset TAURI_SIGNING_PRIVATE_KEY
|
||||
unset TAURI_SIGNING_PUBLIC_KEY
|
||||
pnpm build
|
||||
postPatch =
|
||||
lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
for libappindicatorRs in $cargoDepsCopy/*/libappindicator-sys-*/src/lib.rs; do
|
||||
if [[ -f "$libappindicatorRs" ]]; then
|
||||
substituteInPlace "$libappindicatorRs" \
|
||||
--replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
|
||||
fi
|
||||
done
|
||||
''
|
||||
+ ''
|
||||
substituteInPlace src-tauri/tauri.conf.json \
|
||||
--replace-fail '"createUpdaterArtifacts": true' '"createUpdaterArtifacts": false'
|
||||
'';
|
||||
|
||||
postInstall =
|
||||
if stdenv.hostPlatform.isDarwin then
|
||||
''
|
||||
mkdir -p $out/bin
|
||||
makeWrapper "$out/Applications/Chiri.app/Contents/MacOS/chiri" "$out/bin/chiri"
|
||||
''
|
||||
else
|
||||
''
|
||||
mv $out/bin/Chiri $out/bin/chiri
|
||||
for desktopFile in \
|
||||
$out/share/applications/Chiri.desktop \
|
||||
$out/share/applications/garden.chiri.Chiri.desktop
|
||||
do
|
||||
if [ -f "$desktopFile" ]; then
|
||||
substituteInPlace "$desktopFile" \
|
||||
--replace-fail "Exec=Chiri" "Exec=chiri"
|
||||
fi
|
||||
done
|
||||
'';
|
||||
# This is needed since the signing keys are private, and are only used in CI during releases anyways. Regular users won't need this.
|
||||
preBuild = ''
|
||||
unset TAURI_SIGNING_PRIVATE_KEY
|
||||
unset TAURI_SIGNING_PUBLIC_KEY
|
||||
pnpm build
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
postInstall =
|
||||
if stdenv.hostPlatform.isDarwin then
|
||||
''
|
||||
mkdir -p $out/bin
|
||||
makeWrapper "$out/Applications/Chiri.app/Contents/MacOS/chiri" "$out/bin/chiri"
|
||||
''
|
||||
else
|
||||
''
|
||||
mv $out/bin/Chiri $out/bin/chiri
|
||||
for desktopFile in \
|
||||
$out/share/applications/Chiri.desktop \
|
||||
$out/share/applications/garden.chiri.Chiri.desktop
|
||||
do
|
||||
if [ -f "$desktopFile" ]; then
|
||||
substituteInPlace "$desktopFile" \
|
||||
--replace-fail "Exec=Chiri" "Exec=chiri"
|
||||
fi
|
||||
done
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script;
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Cross-platform CalDAV task management app";
|
||||
homepage = "https://github.com/chiriapp/chiri";
|
||||
changelog = "https://github.com/chiriapp/chiri/releases/tag/app-v${finalAttrs.version}";
|
||||
license = lib.licenses.zlib;
|
||||
maintainers = with lib.maintainers; [ SapphoSys ];
|
||||
mainProgram = "chiri";
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
}
|
||||
)
|
||||
passthru.updateScript = nix-update-script;
|
||||
|
||||
meta = {
|
||||
description = "Cross-platform CalDAV task management app";
|
||||
homepage = "https://github.com/chiriapp/chiri";
|
||||
changelog = "https://github.com/chiriapp/chiri/releases/tag/app-v${finalAttrs.version}";
|
||||
license = lib.licenses.zlib;
|
||||
maintainers = with lib.maintainers; [ SapphoSys ];
|
||||
mainProgram = "chiri";
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user