From 7238b35c40e0591e96dcffeaa8f5544673bdcaca Mon Sep 17 00:00:00 2001 From: Joerie de Gram Date: Fri, 3 Feb 2023 13:56:55 +0100 Subject: [PATCH] obsidian: make electron version overridable --- pkgs/applications/misc/obsidian/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 45ca034b7471..f7b902cf54cb 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -2,7 +2,7 @@ , fetchurl , lib , makeWrapper -, electron_21 +, electron , makeDesktopItem , graphicsmagick , writeScript @@ -50,7 +50,7 @@ let installPhase = '' runHook preInstall mkdir -p $out/bin - makeWrapper ${electron_21}/bin/electron $out/bin/obsidian \ + makeWrapper ${electron}/bin/electron $out/bin/obsidian \ --add-flags $out/share/obsidian/app.asar \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" install -m 444 -D resources/app.asar $out/share/obsidian/app.asar diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81dcaf9a9c9f..ed549a0dca9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31855,7 +31855,9 @@ with pkgs; obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {}); wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix {}; - obsidian = callPackage ../applications/misc/obsidian { }; + obsidian = callPackage ../applications/misc/obsidian { + electron = electron_21; + }; octoprint = callPackage ../applications/misc/octoprint { };