mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
hakuneko: remove atomEnv
This commit is contained in:
parent
71e4764cee
commit
d6d69c2a55
|
@ -1,5 +1,4 @@
|
||||||
{ atomEnv
|
{ autoPatchelfHook
|
||||||
, autoPatchelfHook
|
|
||||||
, dpkg
|
, dpkg
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, makeDesktopItem
|
, makeDesktopItem
|
||||||
|
@ -8,6 +7,11 @@
|
||||||
, stdenv
|
, stdenv
|
||||||
, lib
|
, lib
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook
|
||||||
|
, alsa-lib
|
||||||
|
, nss
|
||||||
|
, nspr
|
||||||
|
, systemd
|
||||||
|
, xorg
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
desktopItem = makeDesktopItem {
|
desktopItem = makeDesktopItem {
|
||||||
|
@ -39,6 +43,7 @@ stdenv.mkDerivation rec {
|
||||||
dontPatchELF = true;
|
dontPatchELF = true;
|
||||||
dontWrapGApps = true;
|
dontWrapGApps = true;
|
||||||
|
|
||||||
|
# TODO: migrate off autoPatchelfHook and use nixpkgs' electron
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
autoPatchelfHook
|
autoPatchelfHook
|
||||||
dpkg
|
dpkg
|
||||||
|
@ -46,7 +51,14 @@ stdenv.mkDerivation rec {
|
||||||
wrapGAppsHook
|
wrapGAppsHook
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = atomEnv.packages;
|
buildInputs = [
|
||||||
|
alsa-lib
|
||||||
|
nss
|
||||||
|
nspr
|
||||||
|
xorg.libXScrnSaver
|
||||||
|
xorg.libXtst
|
||||||
|
systemd
|
||||||
|
];
|
||||||
|
|
||||||
unpackPhase = ''
|
unpackPhase = ''
|
||||||
# The deb file contains a setuid binary, so 'dpkg -x' doesn't work here
|
# The deb file contains a setuid binary, so 'dpkg -x' doesn't work here
|
||||||
|
|
Loading…
Reference in a new issue