Skip to content

Commit e9a1d2a

Browse files
authored
cherry-studio: 1.2.10 -> 1.3.0 (#406316)
2 parents e5c2aa8 + a4a322c commit e9a1d2a

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

pkgs/by-name/ch/cherry-studio/package.nix

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ let
1818
in
1919
stdenv.mkDerivation (finalAttrs: {
2020
pname = "cherry-studio";
21-
version = "1.2.10";
21+
version = "1.3.0";
2222

2323
src = fetchFromGitHub {
2424
owner = "CherryHQ";
2525
repo = "cherry-studio";
2626
tag = "v${finalAttrs.version}";
27-
hash = "sha256-txzZbtA6Fvc/2cpD9YM5wwtZix+qjtW0B6aAV4I7Ce8=";
27+
hash = "sha256-/cj4wMYPWjO5tJxIDdP7GkciWLVZBiDivEIHiOxpk0s=";
2828
};
2929

3030
postPatch = ''
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
4141

4242
offlineCache = yarn-berry.fetchYarnBerryDeps {
4343
inherit (finalAttrs) src missingHashes;
44-
hash = "sha256-rKXUGfBL8upKU5MIe9fqHyEETNKsWdiUdsbHmvJPQdQ=";
44+
hash = "sha256-WUsG8mqozphU2YIT73KqMNP62TBiay3EiGrMBgd2QJw=";
4545
};
4646

4747
nativeBuildInputs = [
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
7979
exec = "cherry-studio --no-sandbox %U";
8080
terminal = false;
8181
icon = "cherry-studio";
82-
startupWMClass = "Cherry Studio";
82+
startupWMClass = "CherryStudio";
8383
categories = [ "Utility" ];
8484
mimeTypes = [ "x-scheme-handler/cherrystudio" ];
8585
})
@@ -88,12 +88,12 @@ stdenv.mkDerivation (finalAttrs: {
8888
installPhase = ''
8989
runHook preInstall
9090
91-
mkdir -p $out/lib/cherry-studio
92-
cp -r dist/linux-unpacked/{resources,LICENSE*} $out/lib/cherry-studio
91+
mkdir -p $out/opt/cherry-studio
92+
cp -r dist/linux-unpacked/{resources,LICENSE*} $out/opt/cherry-studio
9393
install -Dm644 build/icon.png $out/share/pixmaps/cherry-studio.png
9494
makeWrapper ${lib.getExe electron} $out/bin/cherry-studio \
9595
--inherit-argv0 \
96-
--add-flags $out/lib/cherry-studio/resources/app.asar \
96+
--add-flags $out/opt/cherry-studio/resources/app.asar \
9797
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \
9898
--add-flags ${lib.escapeShellArg commandLineArgs}
9999

pkgs/by-name/ch/cherry-studio/update.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ nix-update cherry-studio --version "$latestVersion" || true
1919

2020
export HOME=$(mktemp -d)
2121
src=$(nix-build --no-link $PWD -A cherry-studio.src)
22-
TMPDIR=$(mktemp -d)
23-
cp --recursive --no-preserve=mode $src/* $TMPDIR
24-
cd $TMPDIR
22+
WORKDIR=$(mktemp -d)
23+
cp --recursive --no-preserve=mode $src/* $WORKDIR
24+
pushd $WORKDIR
2525
yarn-berry-fetcher missing-hashes yarn.lock >$PACKAGE_DIR/missing-hashes.json
26-
rm -rf $TMPDIR
26+
popd
2727

2828
nix-update cherry-studio --version skip || true

0 commit comments

Comments
 (0)