JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x11docker: add missing dependencies

Browse Source
This commit is contained in:
Mario Rodas 2019-11-03 09:00:00 -05:00
parent a40b03c608
commit 8a1569d1c5
No known key found for this signature in database
GPG Key ID: 4C4BEFD7B18DC5E8
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/virtualization/x11docker/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg }: { stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "x11docker"; pname = "x11docker";
version = "6.3.0"; version = "6.3.0";
@ -9,18 +9,14 @@ stdenv.mkDerivation rec {
sha256 = "0x2sx41y3ylzg511x52k3wh8mfbzp4ialpas6sn4ccagqxh2hc4y"; sha256 = "0x2sx41y3ylzg511x52k3wh8mfbzp4ialpas6sn4ccagqxh2hc4y";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ nx-libs xorg.xhost xorg.xinit ];
dontBuild = true; dontBuild = true;
PATH_PREFIX = "${nx-libs}/bin:${xorg.xdpyinfo}/bin:${xorg.xhost}/bin:${xorg.xinit}/bin"; # Don't install `x11docker-gui`, because requires `kaptain` dependency
installPhase = '' installPhase = ''
install -D x11docker "$out/bin/x11docker"; install -D x11docker "$out/bin/x11docker";
#install -D x11docker-gui "$out/bin/x11docker-gui"; wrapProgram "$out/bin/x11docker" \
wrapProgram "$out/bin/x11docker" --prefix PATH : "${PATH_PREFIX}" --prefix PATH : "${stdenv.lib.makeBinPath [ getopt gnugrep gawk ps mount iproute nx-libs xorg.xdpyinfo xorg.xhost xorg.xinit ]}"
#wrapProgram "$out/bin/x11docker-gui" --prefix PATH : "${PATH_PREFIX}"
# GUI disabled because of missing `kaptain` dependency
''; '';
meta = { meta = {
@ -28,5 +24,6 @@ stdenv.mkDerivation rec {
homepage = https://github.com/mviereck/x11docker; homepage = https://github.com/mviereck/x11docker;
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ jD91mZM2 ]; maintainers = with stdenv.lib.maintainers; [ jD91mZM2 ];
platforms = stdenv.lib.platforms.linux;
}; };
} }