diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-02-26 16:20:28 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-02-26 16:20:28 +0100 |
commit | 647438344bfc1f77791391e2b4f98eef865c63dc (patch) | |
tree | ef580867fc6cc413940e4330d939cf1afda082cb /nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix | |
parent | b084c6a0fab7f32c904c5c8e8db8dddcefbe507f (diff) | |
parent | e3474e1d1e53b70e2b2af73ea26d6340e82f6b8b (diff) | |
download | nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.tar nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.tar.gz nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.tar.bz2 nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.tar.lz nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.tar.xz nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.tar.zst nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.zip |
Merge commit 'e3474e1d1e53'
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix b/nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix index aae85f1e4384..1cb77d4e05f6 100644 --- a/nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix +++ b/nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix @@ -2,7 +2,6 @@ , lib , fetchzip , copyDesktopItems -, makeDesktopItem , makeWrapper , runCommand , appimageTools @@ -24,6 +23,13 @@ let } '' appimage-exec.sh -x $out ${src}/${pname}-${version}/${pname} + + # JetBrains ship a broken desktop file. Despite registering a custom + # scheme handler for jetbrains:// URLs, they never mark the command as + # being suitable for passing URLs to. Ergo, the handler never receives + # its payload. This causes various things to break, including login. + # Reported upstream at: https://youtrack.jetbrains.com/issue/TBX-11478/ + sed -Ei '/^Exec=/s/( %U)?$/ %U/' $out/jetbrains-toolbox.desktop ''; appimage = appimageTools.wrapAppImage { @@ -31,19 +37,6 @@ let src = appimageContents; extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.targetPkgs pkgs); }; - - desktopItem = makeDesktopItem { - name = "JetBrains Toolbox"; - exec = "jetbrains-toolbox"; - comment = "JetBrains Toolbox"; - desktopName = "JetBrains Toolbox"; - type = "Application"; - icon = "jetbrains-toolbox"; - terminal = false; - categories = [ "Development" ]; - startupWMClass = "jetbrains-toolbox"; - startupNotify = false; - }; in stdenv.mkDerivation { inherit pname version src appimage; @@ -61,7 +54,7 @@ stdenv.mkDerivation { runHook postInstall ''; - desktopItems = [ desktopItem ]; + desktopItems = [ "${appimageContents}/jetbrains-toolbox.desktop" ]; # Disabling the tests, this seems to be very difficult to test this app. doCheck = false; |