Unverified Commit e9e13808 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #321630 from r-ryantm/auto-update/celeste

celeste: 0.8.1 -> 0.8.3
parents 04a94928 2d61beba
Loading
Loading
Loading
Loading
+11 −4
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
, stdenv
, rustPlatform
, fetchFromGitHub
, substituteAll
, darwin
, just
, pkg-config
, wrapGAppsHook4
@@ -20,16 +20,16 @@

rustPlatform.buildRustPackage rec {
  pname = "celeste";
  version = "0.8.1";
  version = "0.8.3";

  src = fetchFromGitHub {
    owner = "hwittenborn";
    repo = "celeste";
    rev = "v${version}";
    hash = "sha256-fJK3UTa5NS+dSsjnqZtRN3HmHQ1bYU2jepkJ5tchYD4=";
    hash = "sha256-Yj2PvAlAkwLaSE27KnzEmiRAD5K/YVGbF4+N3uhDVT8=";
  };

  cargoHash = "sha256-/0w52bh9CsBoMTJsnWuEAQNgQzf92mbzh53H4iQYswc=";
  cargoHash = "sha256-nlYkFgm5r6nAbJvtrXW2VxzVYq1GrSs8bzHYWOglL1c=";

  postPatch = ''
    pushd $cargoDepsCopy/librclone-sys
@@ -66,8 +66,15 @@ rustPlatform.buildRustPackage rec {
    libadwaita
    librclone
    pango
  ] ++ lib.optionals stdenv.isDarwin [
    darwin.apple_sdk.frameworks.Foundation
    darwin.apple_sdk.frameworks.Security
  ];

  env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [
    "-Wno-error=incompatible-function-pointer-types"
  ]);

  preFixup = ''
    gappsWrapperArgs+=(
      --prefix PATH : "${lib.makeBinPath [ rclone ]}"