nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 15:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #307616 from huantianad/tetrio-plus-0-27-2

Browse Source 
tetrio-desktop: unstable-2024-04-20 -> 0.27.2
This commit is contained in:
Jörg Thalheim 2024-04-29 09:42:07 +02:00 committed by GitHub
commit b64e2c28a7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/by-name/te/tetrio-desktop/package.nix
View File

@ -28,7 +28,12 @@ stdenv.mkDerivation (finalAttrs: {
let
tetrio-plus' =
if tetrio-plus == null
then callPackage ./tetrio-plus.nix { tetrio-src = finalAttrs.src; }
then
callPackage ./tetrio-plus.nix
{
tetrio-src = finalAttrs.src;
tetrio-version = finalAttrs.version;
}
else tetrio-plus;
asarPath =

14
pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix
View File

@ -14,16 +14,17 @@
, asar
, tetrio-src
, tetrio-version
}:
let
version = "unstable-2024-04-20";
version = "0.27.2";
src = fetchFromGitLab {
owner = "UniQMG";
repo = "tetrio-plus";
rev = "8091b969cddbff32254eaebf8088efb63f4c519a";
hash = "sha256-ow9DrS3jWNtTbz8Obj4l8Zdr3u9m7f9V3dYUE2H3thk=";
rev = "electron-v${version}-tetrio-v${lib.versions.major tetrio-version}";
hash = "sha256-PvTivTt1Zuvk5gaCcQDcIBFsUf/ZG7TJYXqm0NP++Bw=";
fetchSubmodules = true;
# tetrio-plus uses this info for displaying its version,
@ -52,7 +53,7 @@ let
sourceRoot = "${src.name}/tpsecore";
cargoHash = "sha256-r5Qcu2u/ju0b/1PWz9tE5jNlNS3PfzS79Gm1XSKA3W4=";
cargoHash = "sha256-K9l8wQOtjf3l8gZMMdVnaNrgzVWGl62iBBcpA+ulJbw=";
nativeBuildInputs = [
wasm-pack
@ -127,6 +128,11 @@ stdenv.mkDerivation (finalAttrs: {
cp -r $src out/tetrioplus
chmod -R u+w out/tetrioplus
# Disable the uninstall button in the tetrio-plus popup,
# as it doesn't make sense to mutably uninstall it in a nix package
substituteInPlace out/tetrioplus/desktop-manifest.js \
--replace-fail '"show_uninstaller_button": true' '"show_uninstaller_button": false'
# We don't need the tpsecore source code bundled
rm -rf out/tetrioplus/tpsecore/
# since we install the compiled version here