diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2019-11-03 11:03:02 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-03 11:03:02 -0500 |
commit | f0316587546d3beb16a63b2f677f42c9baf5e3ec (patch) | |
tree | 0731fce9130f244f0085e626d24c30cbfe806039 /pkgs/applications | |
parent | 36c6d76db4d6e45575d5897ed7044ee84904ff0c (diff) | |
parent | 8a1569d1c5813a2e56191f77fa83684360bc863f (diff) | |
download | nixpkgs-f0316587546d3beb16a63b2f677f42c9baf5e3ec.tar nixpkgs-f0316587546d3beb16a63b2f677f42c9baf5e3ec.tar.gz nixpkgs-f0316587546d3beb16a63b2f677f42c9baf5e3ec.tar.bz2 nixpkgs-f0316587546d3beb16a63b2f677f42c9baf5e3ec.tar.lz nixpkgs-f0316587546d3beb16a63b2f677f42c9baf5e3ec.tar.xz nixpkgs-f0316587546d3beb16a63b2f677f42c9baf5e3ec.tar.zst nixpkgs-f0316587546d3beb16a63b2f677f42c9baf5e3ec.zip |
Merge pull request #72703 from r-ryantm/auto-update/x11docker
x11docker: 6.2.0 -> 6.3.0
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/virtualization/x11docker/default.nix | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index 1d18e4d14e8..c57a7f6e771 100644 --- a/pkgs/applications/virtualization/x11docker/default.nix +++ b/pkgs/applications/virtualization/x11docker/default.nix @@ -1,26 +1,22 @@ -{ 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.2.0"; + version = "6.3.0"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "19q5vrhspxpjkdhhlgya2sa2fgjg8gyd3kmnb83nlfs46p8jx4f4"; + 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; }; } |