From 8b42217cb873fe37e435b022fe7390702206cd7e Mon Sep 17 00:00:00 2001 From: Haak Saxberg Date: Sat, 17 Feb 2024 09:34:05 -0800 Subject: [PATCH] Fix obsidian derivation problem (https://github.com/NixOS/nixpkgs/issues/277911) --- nix/home/desktop.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nix/home/desktop.nix b/nix/home/desktop.nix index 04aede8..592059b 100644 --- a/nix/home/desktop.nix +++ b/nix/home/desktop.nix @@ -1,6 +1,15 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: let + obsidian = lib.throwIf (lib.versionOlder "1.5.16" pkgs.obsidian.version) "Obsidian no longer requires EOL Electron" ( + pkgs.obsidian.override { + electron = pkgs.electron_25.overrideAttrs (_: { + preFixup = "patchelf --add-needed ${pkgs.libglvnd}/lib/libEGL.so.1 $out/bin/electron"; # NixOS/nixpkgs#272912 + meta.knownVulnerabilities = [ ]; # NixOS/nixpkgs#273611 + }); + } + ); + defaultPkgs = with pkgs; [ calibre dmenu