Unverified Commit aaf2e4e7 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #259817 from dotlambda/celeste-0.6.0 

celeste: 0.5.8 -> 0.7.0
parents 949d04a8 6abdbda9

pkgs/applications/networking/sync/celeste/default.nix

+3 −19
Original line number Diff line number Diff line 
{ lib

, stdenv

, rust

, rustPlatform

, fetchFromGitHub

, substituteAll
@@ -22,23 +21,16 @@ 


rustPlatform.buildRustPackage rec {

  pname = "celeste";

  version = "0.5.8";

  version = "0.7.0";



  src = fetchFromGitHub {

    owner = "hwittenborn";

    repo = "celeste";

    rev = "v${version}";

    hash = "sha256-U/6aqQig+uuWj/B9CODnV6chxY+KfMH7DqnPtSTDSA0=";

    hash = "sha256-fqPAQCbuPnFyn3wioWDETmcXu53808nvnlEzcdUevI4=";

  };



  cargoHash = "sha256-69LK/oicfmSPbUGGzWV9kvXkHqMvEzCG8xCu61MxSdk=";



  patches = [

    (substituteAll {

      src = ./target-dir.patch;

      rustTarget = rust.toRustTarget stdenv.hostPlatform;

    })

  ];

  cargoHash = "sha256-mVl7CsCX7HMlGC2EIKEfHnPNjmrexjsrpDK/Uq/GwpY=";



  postPatch = ''

    pushd $cargoDepsCopy/librclone-sys
@@ -61,14 +53,6 @@ rustPlatform.buildRustPackage rec { 
    cargo update --offline

  '';



  # We need to build celeste-tray first because celeste/src/launch.rs reads that file at build time.

  # Upstream does the same: https://github.com/hwittenborn/celeste/blob/765dfa2/justfile#L1-L3

  cargoBuildFlags = [ "--bin" "celeste-tray" ];

  postConfigure = ''

    cargoBuildHook

    cargoBuildFlags=

  '';



  RUSTC_BOOTSTRAP = 1;



  nativeBuildInputs = [

pkgs/applications/networking/sync/celeste/target-dir.patch

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
diff --git a/celeste/src/launch.rs b/celeste/src/launch.rs

index 5227170..e3cf189 100644

--- a/celeste/src/launch.rs

+++ b/celeste/src/launch.rs

@@ -172,10 +172,7 @@ impl TrayApp {

         perms.set_mode(0o755);

         file.set_permissions(perms).unwrap();

 

-        #[cfg(debug_assertions)]

-        let tray_file = include_bytes!("../../target/debug/celeste-tray");

-        #[cfg(not(debug_assertions))]

-        let tray_file = include_bytes!("../../target/release/celeste-tray");

+        let tray_file = include_bytes!(concat!("../../target/@rustTarget@/", env!("cargoBuildType"), "/celeste-tray"));

 

         file.write_all(tray_file).unwrap();

         drop(file);