diff options
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r-- | pkgs/applications/office/morgen/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/office/qownnotes/default.nix | 19 | ||||
-rw-r--r-- | pkgs/applications/office/treesheets/default.nix | 6 |
3 files changed, 19 insertions, 8 deletions
diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 41cae1da04e3b..a77655588464b 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { --replace '/opt/Morgen' $out/bin makeWrapper ${electron}/bin/electron $out/bin/morgen \ - --add-flags $out/opt/Morgen/resources/app.asar + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebRTCPipeWireCapturer}} $out/opt/Morgen/resources/app.asar" runHook postInstall ''; diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index eb5fde0a3e0d6..2009c6f9a0bcb 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -14,19 +14,21 @@ , botan2 , pkg-config , nixosTests +, installShellFiles +, xvfb-run }: let pname = "qownnotes"; appname = "QOwnNotes"; - version = "24.4.0"; + version = "24.4.2"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-SxoZD5DYuPAJZwBiw38jZYI+e9FExj+TiUlczvbXkWA="; + hash = "sha256-HnWxIcOy7Te6Q5YfZYhvITpfsgeQw8Tt/Nr++wcpxEU="; }; nativeBuildInputs = [ @@ -34,6 +36,8 @@ stdenv.mkDerivation { qttools wrapQtAppsHook pkg-config + installShellFiles + xvfb-run ] ++ lib.optionals stdenv.isDarwin [ makeWrapper ]; buildInputs = [ @@ -49,9 +53,16 @@ stdenv.mkDerivation { "USE_SYSTEM_BOTAN=1" ]; - postInstall = + postInstall = '' + installShellCompletion --cmd ${appname} \ + --bash <(xvfb-run $out/bin/${appname} --completion bash) \ + --fish <(xvfb-run $out/bin/${appname} --completion fish) + installShellCompletion --cmd ${pname} \ + --bash <(xvfb-run $out/bin/${appname} --completion bash) \ + --fish <(xvfb-run $out/bin/${appname} --completion fish) + '' # Create a lowercase symlink for Linux - lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.isLinux '' ln -s $out/bin/${appname} $out/bin/${pname} '' # Wrap application for macOS as lowercase binary diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index ce728ce2fd75c..c67f53949ce72 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2024-03-30"; + version = "unstable-2024-04-11"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "f5b13ed93eacdd62851081d0730ec5f8b306c1e6"; - sha256 = "CoIvJzfVmblMPH0J45ykpRF7CDLj/Dx+8MpkjiQkMkM="; + rev = "5e9e95a34221d4bda584d2130586177e29ee8fe7"; + sha256 = "X0aB0rJZd9G8S+QWviSAdB/YQMT4lVV3yiELzZs+P3g="; }; nativeBuildInputs = [ |