diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-17 07:58:47 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-17 08:05:24 +0100 |
| commit | f7f1a2f54ef2b744a26e37418dd6354bc46aa20a (patch) | |
| tree | 03b40b737111f3677fbf508dce58a29cfc81fc1b /pkgs/applications/virtualization | |
| parent | 705167a5dceb53befd22f4e6184bbfba0813b73d (diff) | |
| parent | c904c2ec09cbee8b46bee136e062e611d249cdf2 (diff) | |
| download | nixlib-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.tar nixlib-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.tar.gz nixlib-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.tar.bz2 nixlib-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.tar.lz nixlib-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.tar.xz nixlib-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.tar.zst nixlib-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.zip | |
Merge branch 'master' into staging-next
A mass darwin rebuild from master (#55784).
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/virt-manager/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/x11docker/default.nix | 32 |
2 files changed, 34 insertions, 2 deletions
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 52732f0c5f10..91934a3610b8 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -10,12 +10,12 @@ with stdenv.lib; python3Packages.buildPythonApplication rec { name = "virt-manager-${version}"; - version = "2.0.0"; + version = "2.1.0"; namePrefix = ""; src = fetchurl { url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz"; - sha256 = "1b48xbrx99mfiv80c60k3ydzkpcpbq57c8h8dl0gnffmnzbs8vzb"; + sha256 = "1m038kyngmxlgz91c7z8g73lb2wy0ajyah871a3g3wb5cnd0dsil"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix new file mode 100644 index 000000000000..8e248061cd5e --- /dev/null +++ b/pkgs/applications/virtualization/x11docker/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg }: +stdenv.mkDerivation rec { + name = "x11docker-${version}"; + version = "5.4.1"; + src = fetchFromGitHub { + owner = "mviereck"; + repo = "x11docker"; + rev = "v${version}"; + sha256 = "0fcdr8i3crf4cina41h030q2jf5zvafll97iff129dl3sb27jnvi"; + }; + 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"; + + 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 + ''; + + meta = { + description = "Run graphical applications with Docker"; + homepage = https://github.com/mviereck/x11docker; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ jD91mZM2 ]; + }; +} |