From 8e85f23d0e4dc4700319dac3c5a67ae48b2d2b64 Mon Sep 17 00:00:00 2001 From: Adam Dinwoodie Date: Wed, 12 Feb 2025 21:13:01 +0000 Subject: [PATCH] azuredatastudio: fix file dialogs File open dialogs in Azure Data Studio cause the application to crash. As documented in #225989, this can be worked around by setting XDG_DATA_DIRS, but the correct fix is to use GApps hooks. Add those to the program packaging, and move the custom fixup phase to a pre-fixup hook, so the main hooks also get run. Fixes #225989 --- pkgs/by-name/az/azuredatastudio/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/az/azuredatastudio/package.nix b/pkgs/by-name/az/azuredatastudio/package.nix index dcc16f4f55c3..6b117f205b5c 100644 --- a/pkgs/by-name/az/azuredatastudio/package.nix +++ b/pkgs/by-name/az/azuredatastudio/package.nix @@ -28,6 +28,7 @@ openssl, pango, systemd, + wrapGAppsHook3, xorg, zlib, }: @@ -108,6 +109,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper copyDesktopItems + wrapGAppsHook3 ]; buildInputs = [ @@ -180,7 +182,7 @@ stdenv.mkDerivation rec { sqltoolsserviceRpath ]; - fixupPhase = '' + preFixup = '' fix_sqltoolsservice() { mv ${sqltoolsservicePath}/$1 ${sqltoolsservicePath}/$1_old