Merge pull request #219936 from huantianad/tetrio-plus-update0253

tetrio-plus: 0.25.2 -> 0.25.3, use dpkg for unpack
This commit is contained in:
Weijia Wang 2023-03-16 17:18:47 +02:00 committed by GitHub
commit ac9572b270
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 14 deletions

View File

@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchurl
, dpkg
, autoPatchelfHook
, wrapGAppsHook
, alsa-lib
@ -29,10 +30,13 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
dpkg
autoPatchelfHook
wrapGAppsHook
];
dontWrapGApps = true;
buildInputs = [
alsa-lib
cups
@ -44,24 +48,20 @@ stdenv.mkDerivation rec {
gtk3
];
dontWrapGApps = true;
libPath = lib.makeLibraryPath [
libpulseaudio
systemd
];
unpackPhase = ''
mkdir -p $TMP/tetrio-desktop $out/bin
cp $src $TMP/tetrio-desktop.deb
ar vx $TMP/tetrio-desktop.deb
tar --no-overwrite-dir -xvf data.tar.xz -C $TMP/tetrio-desktop/
'';
unpackCmd = "dpkg -x $curSrc src";
installPhase = ''
runHook preInstall
cp -R $TMP/tetrio-desktop/{usr/share,opt} $out/
mkdir $out
cp -r opt/ usr/share/ $out
mkdir $out/bin
ln -s $out/opt/TETR.IO/tetrio-desktop $out/bin/
substituteInPlace $out/share/applications/tetrio-desktop.desktop \
@ -71,8 +71,8 @@ stdenv.mkDerivation rec {
'';
postInstall = lib.strings.optionalString withTetrioPlus ''
cp ${tetrio-plus} $out/opt/TETR.IO/resources/app.asar
'';
cp ${tetrio-plus} $out/opt/TETR.IO/resources/app.asar
'';
postFixup = ''
wrapProgram $out/opt/TETR.IO/tetrio-desktop \

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "tetrio-plus";
version = "0.25.2";
version = "0.25.3";
src = fetchzip {
url = "https://gitlab.com/UniQMG/tetrio-plus/uploads/5c720489d2bcd35629b4f8a1f36d28b1/tetrio-plus_0.25.2_app.asar.zip";
sha256 = "sha256-8Xc2wftRYIMZ2ee67IJEIGGrAAS02CL0XzDqQ/luYVE=";
url = "https://gitlab.com/UniQMG/tetrio-plus/uploads/684477053451cd0819e2c84e145966eb/tetrio-plus_0.25.3_app.asar.zip";
sha256 = "sha256-GQgt4GZNeKx/uzmVsuKppW2zg8AAiGqsk2JYJIkqfVE=";
};
installPhase = ''