From 604649162f1a8cc7cc38b2cd7628bc491fa5b740 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 3 Oct 2023 02:47:46 +0200 Subject: [PATCH] simplenote: remove atomEnv --- pkgs/applications/misc/simplenote/default.nix | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 35f153393518..82008de9576b 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -1,5 +1,4 @@ -{ atomEnv -, autoPatchelfHook +{ autoPatchelfHook , dpkg , fetchurl , makeDesktopItem @@ -7,7 +6,13 @@ , lib , stdenv , udev +, alsa-lib +, mesa +, nss +, nspr +, systemd , wrapGAppsHook +, xorg }: let @@ -40,9 +45,7 @@ let inherit pname version meta; src = fetchurl { - url = - "https://github.com/Automattic/simplenote-electron/releases/download/" - + "v${version}/Simplenote-linux-${version}-amd64.deb"; + url = "https://github.com/Automattic/simplenote-electron/releases/download/v${version}/Simplenote-linux-${version}-amd64.deb"; inherit sha256; }; @@ -61,6 +64,7 @@ let dontPatchELF = true; dontWrapGApps = true; + # TODO: migrate off autoPatchelfHook and use nixpkgs' electron nativeBuildInputs = [ autoPatchelfHook dpkg @@ -68,7 +72,16 @@ let wrapGAppsHook ]; - buildInputs = atomEnv.packages; + buildInputs = [ + alsa-lib + mesa + xorg.libXScrnSaver + xorg.libXtst + nss + nspr + stdenv.cc.cc + systemd + ]; unpackPhase = "dpkg-deb -x $src .";