diff --git a/pkgs/applications/office/minetime/default.nix b/pkgs/applications/office/minetime/default.nix new file mode 100644 index 00000000000..85e8bc131ce --- /dev/null +++ b/pkgs/applications/office/minetime/default.nix @@ -0,0 +1,31 @@ +{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 }: + +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"; + }; + + profile = '' + export LC_ALL=C.UTF-8 + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + + multiPkgs = null; # no 32bit needed + extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; + extraInstallCommands = "mv $out/bin/{${name},${pname}}"; + + meta = with lib; { + description = "Modern, intuitive and smart calendar application"; + homepage = https://minetime.ai; + license = licenses.unfree; + # Should be cross-platform, but for now we just grab the appimage + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 6db626464fb..f0c0faa8cda 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -23,7 +23,7 @@ rec { buildCommand = '' install $src ./appimage patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ --replace-needed libz.so.1 ${zlib}/lib/libz.so.1 \ ./appimage @@ -33,7 +33,7 @@ rec { ''; }; - wrapAppImage = { name, src, extraPkgs }: buildFHSUserEnv (defaultFhsEnvArgs // { + wrapAppImage = args@{ name, src, extraPkgs, ... }: buildFHSUserEnv (defaultFhsEnvArgs // { inherit name; targetPkgs = pkgs: defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs; @@ -46,17 +46,15 @@ rec { cd $APPDIR exec ./AppRun "$@" ''; + } // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage)))); + + wrapType1 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // { + src = extractType1 { inherit name src; }; }); - wrapType1 = args@{ name, src, extraPkgs ? pkgs: [] }: wrapAppImage { - inherit name extraPkgs; - src = extractType1 { inherit name src; }; - }; - - wrapType2 = args@{ name, src, extraPkgs ? pkgs: [] }: wrapAppImage { - inherit name extraPkgs; + wrapType2 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // { src = extractType2 { inherit name src; }; - }; + }); defaultFhsEnvArgs = { name = "appimage-env"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2cc4b3dd493..0f5de969943 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4401,6 +4401,8 @@ in mimetic = callPackage ../development/libraries/mimetic { }; + minetime = callPackage ../applications/office/minetime { }; + minio-client = callPackage ../tools/networking/minio-client { buildGoPackage = buildGo110Package; };