From 0aa33ee5d1eb8392df3bdaf0dc2792dbf9bf5960 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 19 Nov 2019 12:17:13 -0600 Subject: [PATCH 1/3] minetime: 1.5.1 -> 1.7.1, patch scheduling service util --- pkgs/applications/office/minetime/default.nix | 37 ++++++++++++++----- 1 file 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; { From 4cfe67f10450f4f2d0ff2b9694a2a7a5a0f4836e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 3 Dec 2019 13:01:17 -0600 Subject: [PATCH 2/3] minetime: 1.7.1 -> 1.7.2 --- pkgs/applications/office/minetime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/minetime/default.nix b/pkgs/applications/office/minetime/default.nix index e39332ab7bc..ca1da220320 100644 --- a/pkgs/applications/office/minetime/default.nix +++ b/pkgs/applications/office/minetime/default.nix @@ -3,10 +3,10 @@ let name = "${pname}-${version}"; pname = "minetime"; - version = "1.7.1"; + version = "1.7.2"; appimage = fetchurl { url = "https://github.com/marcoancona/MineTime/releases/download/v${version}/${name}.AppImage"; - sha256 = "0jbb8am3rwnjhaxf52rhsgq0cppw3x64h4130brhawri6g4gz44l"; + sha256 = "15gjh4cywg2c4bzxslidk80z4bcsdwjr1mbvf2a5madx3vygfaw1"; }; extracted = appimageTools.extractType2 { inherit name; From c997aca310ce1bfa5f8c387723b200f4d29f172b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 5 Dec 2019 13:48:22 -0600 Subject: [PATCH 3/3] minetime: 1.7.2 -> 1.7.3 --- pkgs/applications/office/minetime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/minetime/default.nix b/pkgs/applications/office/minetime/default.nix index ca1da220320..42802409e59 100644 --- a/pkgs/applications/office/minetime/default.nix +++ b/pkgs/applications/office/minetime/default.nix @@ -3,10 +3,10 @@ let name = "${pname}-${version}"; pname = "minetime"; - version = "1.7.2"; + version = "1.7.3"; appimage = fetchurl { url = "https://github.com/marcoancona/MineTime/releases/download/v${version}/${name}.AppImage"; - sha256 = "15gjh4cywg2c4bzxslidk80z4bcsdwjr1mbvf2a5madx3vygfaw1"; + sha256 = "0zz6p3mwxg9gm1sqzs582pq2nkb10lv0c3r542b9llqyzk9qv5aa"; }; extracted = appimageTools.extractType2 { inherit name;