MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #214366 from ius/obisidian-electron

Browse source 
obsidian: make electron version overridable
This commit is contained in:
Weijia Wang 2023-02-03 22:20:17 +01:00 committed by GitHub
commit f0df587810
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/misc/obsidian/default.nix
View file

@ -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

4
pkgs/top-level/all-packages.nix
View file

@ -31827,7 +31827,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 { };