diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-11-19 04:34:56 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-11-19 04:35:51 +0100 |
| commit | b69f568f4c3ebaf48a7f66b0f051d28157a61afb (patch) | |
| tree | 802888f3277bcd91a4ecb26d164318360116a91e /pkgs/tools/X11 | |
| parent | 775a729da7a36f817303d925aa250544c3eca77b (diff) | |
| parent | 380bb207b66d559f66b34909a75bd1b588a52d9f (diff) | |
| download | nixlib-b69f568f4c3ebaf48a7f66b0f051d28157a61afb.tar nixlib-b69f568f4c3ebaf48a7f66b0f051d28157a61afb.tar.gz nixlib-b69f568f4c3ebaf48a7f66b0f051d28157a61afb.tar.bz2 nixlib-b69f568f4c3ebaf48a7f66b0f051d28157a61afb.tar.lz nixlib-b69f568f4c3ebaf48a7f66b0f051d28157a61afb.tar.xz nixlib-b69f568f4c3ebaf48a7f66b0f051d28157a61afb.tar.zst nixlib-b69f568f4c3ebaf48a7f66b0f051d28157a61afb.zip | |
Merge branch 'staging'
Hydra rebuild looks fine; only a few Darwin jobs is queued: http://hydra.nixos.org/eval/1304891?compare=1304807
Diffstat (limited to 'pkgs/tools/X11')
| -rw-r--r-- | pkgs/tools/X11/xpra/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 871d5a9dbd8c..4ae367abf612 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pythonPackages, pkgconfig +{ stdenv, lib, fetchurl, python2Packages, pkgconfig , xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config , ffmpeg, x264, libvpx, libwebp @@ -8,7 +8,7 @@ with lib; let - inherit (pythonPackages) python cython buildPythonApplication; + inherit (python2Packages) python cython buildPythonApplication; in buildPythonApplication rec { name = "xpra-0.17.6"; namePrefix = ""; @@ -39,7 +39,7 @@ in buildPythonApplication rec { makeWrapper ]; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python2Packages; [ pillow pygtk pygobject2 rencode pycrypto cryptography pycups lz4 dbus-python netifaces numpy websockify pygobject3 gst-python ]; |