diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2019-11-03 09:00:00 -0500 |
|---|---|---|
| committer | Mario Rodas <marsam@users.noreply.github.com> | 2019-11-03 09:00:00 -0500 |
| commit | 8a1569d1c5813a2e56191f77fa83684360bc863f (patch) | |
| tree | f70cc88a7edf7a6d747a6f88ecc683e7b30a60a2 /pkgs/applications | |
| parent | a40b03c608401120cb51e18e2fc4e64255967e12 (diff) | |
| download | nixpkgs-8a1569d1c5813a2e56191f77fa83684360bc863f.tar nixpkgs-8a1569d1c5813a2e56191f77fa83684360bc863f.tar.gz nixpkgs-8a1569d1c5813a2e56191f77fa83684360bc863f.tar.bz2 nixpkgs-8a1569d1c5813a2e56191f77fa83684360bc863f.tar.lz nixpkgs-8a1569d1c5813a2e56191f77fa83684360bc863f.tar.xz nixpkgs-8a1569d1c5813a2e56191f77fa83684360bc863f.tar.zst nixpkgs-8a1569d1c5813a2e56191f77fa83684360bc863f.zip | |
x11docker: add missing dependencies
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/virtualization/x11docker/default.nix | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index b2ebb2f82af..c57a7f6e771 100644 --- a/pkgs/applications/virtualization/x11docker/default.nix +++ b/pkgs/applications/virtualization/x11docker/default.nix @@ -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 { pname = "x11docker"; version = "6.3.0"; @@ -9,18 +9,14 @@ stdenv.mkDerivation rec { sha256 = "0x2sx41y3ylzg511x52k3wh8mfbzp4ialpas6sn4ccagqxh2hc4y"; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ nx-libs xorg.xhost xorg.xinit ]; 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 = '' install -D x11docker "$out/bin/x11docker"; - #install -D x11docker-gui "$out/bin/x11docker-gui"; - wrapProgram "$out/bin/x11docker" --prefix PATH : "${PATH_PREFIX}" - #wrapProgram "$out/bin/x11docker-gui" --prefix PATH : "${PATH_PREFIX}" - # GUI disabled because of missing `kaptain` dependency + wrapProgram "$out/bin/x11docker" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ getopt gnugrep gawk ps mount iproute nx-libs xorg.xdpyinfo xorg.xhost xorg.xinit ]}" ''; meta = { @@ -28,5 +24,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/mviereck/x11docker; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ jD91mZM2 ]; + platforms = stdenv.lib.platforms.linux; }; } |