3 files changed, 16 insertions, 11 deletions
diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix
index 070152427f29..06a7630c7bc0 100644
--- a/pkgs/tools/X11/nitrogen/default.nix
+++ b/pkgs/tools/X11/nitrogen/default.nix
@@ -1,20 +1,25 @@
 { stdenv, fetchurl, pkgconfig, glib, gtkmm2 }:
 
-let version = "1.5.2";
+let version = "1.6.0";
 in
 stdenv.mkDerivation rec {
   name = "nitrogen-${version}";
 
   src = fetchurl {
-    url = "http://projects.l3ib.org/nitrogen/files/nitrogen-${version}.tar.gz";
-    sha256 = "60a2437ce6a6c0ba44505fc8066c1973140d4bb48e1e5649f525c7b0b8bf9fd2";
+    url = "http://projects.l3ib.org/nitrogen/files/${name}.tar.gz";
+    sha256 = "1pil2qa3v7x56zh9xvba8v96abnf9qgglbsdlrlv0kfjlhzl4jhr";
   };
 
-  buildInputs = [ glib gtkmm2 pkgconfig ];
+  nativeBuildInputs = [ pkgconfig ];
 
-  NIX_LDFLAGS = "-lX11";
+  buildInputs = [ glib gtkmm2 ];
 
-  patchPhase = "patchShebangs data/icon-theme-installer";
+  NIX_CXXFLAGS_COMPILE = "-std=c++11";
+
+  patchPhase = ''
+    substituteInPlace data/Makefile.in --replace /usr/share $out/share
+    patchShebangs data/icon-theme-installer
+  '';
 
   meta = {
     description = "A wallpaper browser and setter for X11";
diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix
index 5707679c03c1..c9530a5cdd98 100644
--- a/pkgs/tools/X11/virtualgl/lib.nix
+++ b/pkgs/tools/X11/virtualgl/lib.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "virtualgl-lib-${version}";
-  version = "2.5";
+  version = "2.5.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/virtualgl/VirtualGL-${version}.tar.gz";
-    sha256 = "1mnpljmx8nxnmpbx4ja430b3y535wkz185qknsxmk27yz4dbmm8l";
+    sha256 = "0n9ngwji9k0hqy81ridndf7z4lwq5dzmqw66r6vxfz15aw0jwd6s";
   };
 
   cmakeFlags = [ "-DVGL_SYSTEMFLTK=1" "-DTJPEG_LIBRARY=${libjpeg_turbo.out}/lib/libturbojpeg.so" ];
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
   ];