push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,31 @@
diff --git a/librclone-sys/build.rs b/librclone-sys/build.rs
index 10e45bc..7d04c08 100644
--- a/librclone-sys/build.rs
+++ b/librclone-sys/build.rs
@@ -16,15 +16,8 @@ fn main() {
println!("cargo:rerun-if-changed=go.mod");
println!("cargo:rerun-if-changed=go.sum");
- Command::new("go")
- .args(["build", "--buildmode=c-archive", "-o"])
- .arg(&format!("{}/librclone.a", out_dir))
- .arg("github.com/rclone/rclone/librclone")
- .status()
- .expect("`go build` failed. Is `go` installed and latest version?");
-
- println!("cargo:rustc-link-search=native={}", out_dir);
- println!("cargo:rustc-link-lib=static=rclone");
+ println!("cargo:rustc-link-search=native={}", "@librclone@/lib");
+ println!("cargo:rustc-link-lib=dylib=rclone");
if target_triple.ends_with("darwin") {
println!("cargo:rustc-link-lib=framework=CoreFoundation");
@@ -32,7 +25,7 @@ fn main() {
}
let bindings = bindgen::Builder::default()
- .header(format!("{}/librclone.h", out_dir))
+ .header(format!("{}/librclone.h", "@librclone@/include"))
.allowlist_function("RcloneRPC")
.allowlist_function("RcloneInitialize")
.allowlist_function("RcloneFinalize")

View File

@@ -0,0 +1,95 @@
{
lib,
stdenv,
rustPlatform,
fetchFromGitHub,
just,
pkg-config,
wrapGAppsHook4,
cairo,
dbus,
gdk-pixbuf,
glib,
graphene,
gtk4,
libadwaita,
librclone,
pango,
rclone,
}:
rustPlatform.buildRustPackage rec {
pname = "celeste";
version = "0.8.3";
src = fetchFromGitHub {
owner = "hwittenborn";
repo = "celeste";
rev = "v${version}";
hash = "sha256-Yj2PvAlAkwLaSE27KnzEmiRAD5K/YVGbF4+N3uhDVT8=";
};
cargoHash = "sha256-OBGDnhpVLOPdYhofWfeaueklt7KBkLhM02JNvuvUQ2Q=";
postPatch = ''
pushd $cargoDepsCopy/librclone-sys-*
oldHash=$(sha256sum build.rs | cut -d " " -f 1)
patch -p2 < ${./librclone-path.patch}
substituteInPlace build.rs \
--subst-var-by librclone ${librclone}
substituteInPlace .cargo-checksum.json \
--replace $oldHash $(sha256sum build.rs | cut -d " " -f 1)
popd
substituteInPlace justfile \
--replace "{{ env_var('DESTDIR') }}/usr" "${placeholder "out"}"
# buildRustPackage takes care of installing the binary
sed -i "#/bin/celeste#d" justfile
'';
RUSTC_BOOTSTRAP = 1;
nativeBuildInputs = [
just
pkg-config
rustPlatform.bindgenHook
wrapGAppsHook4
];
buildInputs = [
cairo
dbus
gdk-pixbuf
glib
graphene
gtk4
libadwaita
librclone
pango
];
env.NIX_CFLAGS_COMPILE = toString (
lib.optionals stdenv.hostPlatform.isDarwin [
"-Wno-error=incompatible-function-pointer-types"
]
);
preFixup = ''
gappsWrapperArgs+=(
--prefix PATH : "${lib.makeBinPath [ rclone ]}"
)
'';
postInstall = ''
just install
'';
meta = {
changelog = "https://github.com/hwittenborn/celeste/blob/${src.rev}/CHANGELOG.md";
description = "GUI file synchronization client that can sync with any cloud provider";
mainProgram = "celeste";
homepage = "https://github.com/hwittenborn/celeste";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ dotlambda ];
};
}