diff options
| author | Will Dietz <w@wdtz.org> | 2019-11-19 12:17:13 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2019-11-19 12:17:13 -0600 |
| commit | 0aa33ee5d1eb8392df3bdaf0dc2792dbf9bf5960 (patch) | |
| tree | aed9f1005957b863df73645ec3dc1fbb1a1304d5 /pkgs/applications/office | |
| parent | 1003613c0825910ddab057820c8c7b571490939b (diff) | |
| download | nixpkgs-0aa33ee5d1eb8392df3bdaf0dc2792dbf9bf5960.tar nixpkgs-0aa33ee5d1eb8392df3bdaf0dc2792dbf9bf5960.tar.gz nixpkgs-0aa33ee5d1eb8392df3bdaf0dc2792dbf9bf5960.tar.bz2 nixpkgs-0aa33ee5d1eb8392df3bdaf0dc2792dbf9bf5960.tar.lz nixpkgs-0aa33ee5d1eb8392df3bdaf0dc2792dbf9bf5960.tar.xz nixpkgs-0aa33ee5d1eb8392df3bdaf0dc2792dbf9bf5960.tar.zst nixpkgs-0aa33ee5d1eb8392df3bdaf0dc2792dbf9bf5960.zip | |
minetime: 1.5.1 -> 1.7.1, patch scheduling service util
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/minetime/default.nix | 37 |
1 files changed, 28 insertions, 9 deletions
diff --git a/pkgs/applications/office/minetime/default.nix b/pkgs/applications/office/minetime/default.nix index 85e8bc131ce..e39332ab7bc 100644 --- a/pkgs/applications/office/minetime/default.nix +++ b/pkgs/applications/office/minetime/default.nix @@ -1,15 +1,32 @@ -{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 }: +{ appimageTools, fetchurl, lib, runCommandNoCC, stdenv, gsettings-desktop-schemas, gtk3, zlib }: let - pname = "minetime"; - version = "1.5.1"; -in -appimageTools.wrapType2 rec { name = "${pname}-${version}"; - src = fetchurl { - url = "https://github.com/marcoancona/MineTime/releases/download/v${version}/${name}-x86_64.AppImage"; - sha256 = "0099cq4p7j01bzs7q79y9xi7g6ji17v9g7cykfjggwsgqfmvd0hz"; + pname = "minetime"; + version = "1.7.1"; + appimage = fetchurl { + url = "https://github.com/marcoancona/MineTime/releases/download/v${version}/${name}.AppImage"; + sha256 = "0jbb8am3rwnjhaxf52rhsgq0cppw3x64h4130brhawri6g4gz44l"; + }; + extracted = appimageTools.extractType2 { + inherit name; + src = appimage; }; + patched = runCommandNoCC "minetime-patchelf" {} '' + cp -av ${extracted} $out + + x=$out/resources/app.asar.unpacked/services/scheduling/dist/MinetimeSchedulingService + chmod +w $x + + patchelf \ + --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ + --replace-needed libz.so.1 ${zlib}/lib/libz.so.1 \ + $x + ''; +in +appimageTools.wrapAppImage rec { + inherit name; + src = patched; profile = '' export LC_ALL=C.UTF-8 @@ -17,7 +34,9 @@ appimageTools.wrapType2 rec { ''; multiPkgs = null; # no 32bit needed - extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; + extraPkgs = ps: + appimageTools.defaultFhsEnvArgs.multiPkgs ps + ++ (with ps; [ at-spi2-core at-spi2-atk libsecret libnotify ]); extraInstallCommands = "mv $out/bin/{${name},${pname}}"; meta = with lib; { |