diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2023-10-03 17:49:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-03 17:49:36 +0200 |
| commit | e5f6200d164f2df4e8bb5e252dd1032b57099d13 (patch) | |
| tree | f817b1eb399a18b1a28eecc53d1348a54fe2a5e9 /pkgs/applications/office | |
| parent | 042d50a96cf55880914d007946a8c8182c9a6a48 (diff) | |
| parent | 244be72e19e96bdfb1e268d002af2e9c0036fbea (diff) | |
| download | nixpkgs-e5f6200d164f2df4e8bb5e252dd1032b57099d13.tar nixpkgs-e5f6200d164f2df4e8bb5e252dd1032b57099d13.tar.gz nixpkgs-e5f6200d164f2df4e8bb5e252dd1032b57099d13.tar.bz2 nixpkgs-e5f6200d164f2df4e8bb5e252dd1032b57099d13.tar.lz nixpkgs-e5f6200d164f2df4e8bb5e252dd1032b57099d13.tar.xz nixpkgs-e5f6200d164f2df4e8bb5e252dd1032b57099d13.tar.zst nixpkgs-e5f6200d164f2df4e8bb5e252dd1032b57099d13.zip | |
Merge pull request #258440 from SuperSandro2000/drop-atom
atom*: drop
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/trilium/desktop.nix | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/applications/office/trilium/desktop.nix b/pkgs/applications/office/trilium/desktop.nix index 949e7505b89..dd3f41df523 100644 --- a/pkgs/applications/office/trilium/desktop.nix +++ b/pkgs/applications/office/trilium/desktop.nix @@ -1,6 +1,7 @@ { stdenv, lib, unzip, autoPatchelfHook -, fetchurl, atomEnv, makeWrapper -, makeDesktopItem, copyDesktopItems, wrapGAppsHook, libxshmfence +, fetchurl, makeWrapper +, alsa-lib, mesa, nss, nspr, systemd +, makeDesktopItem, copyDesktopItems, wrapGAppsHook , metaCommon }: @@ -24,6 +25,7 @@ let src = fetchurl linuxSource; + # TODO: migrate off autoPatchelfHook and use nixpkgs' electron nativeBuildInputs = [ autoPatchelfHook makeWrapper @@ -31,7 +33,14 @@ let copyDesktopItems ]; - buildInputs = atomEnv.packages ++ [ libxshmfence ]; + buildInputs = [ + alsa-lib + mesa + nss + nspr + stdenv.cc.cc + systemd + ]; desktopItems = [ (makeDesktopItem { @@ -64,8 +73,9 @@ let ''; # LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :) + # Error: libstdc++.so.6: cannot open shared object file: No such file or directory preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${atomEnv.libPath}) + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath buildInputs}) ''; dontStrip = true; |