From d6d69c2a559aa0757831d77f849ead1091bfb10a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 3 Oct 2023 15:40:53 +0200 Subject: [PATCH] hakuneko: remove atomEnv --- pkgs/tools/misc/hakuneko/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/hakuneko/default.nix b/pkgs/tools/misc/hakuneko/default.nix index 128cddd8c682..bb7bf24cb659 100644 --- a/pkgs/tools/misc/hakuneko/default.nix +++ b/pkgs/tools/misc/hakuneko/default.nix @@ -1,5 +1,4 @@ -{ atomEnv -, autoPatchelfHook +{ autoPatchelfHook , dpkg , fetchurl , makeDesktopItem @@ -8,6 +7,11 @@ , stdenv , lib , wrapGAppsHook +, alsa-lib +, nss +, nspr +, systemd +, xorg }: let desktopItem = makeDesktopItem { @@ -39,6 +43,7 @@ stdenv.mkDerivation rec { dontPatchELF = true; dontWrapGApps = true; + # TODO: migrate off autoPatchelfHook and use nixpkgs' electron nativeBuildInputs = [ autoPatchelfHook dpkg @@ -46,7 +51,14 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; - buildInputs = atomEnv.packages; + buildInputs = [ + alsa-lib + nss + nspr + xorg.libXScrnSaver + xorg.libXtst + systemd + ]; unpackPhase = '' # The deb file contains a setuid binary, so 'dpkg -x' doesn't work here