diff options
| author | Robin Gloster <mail@glob.in> | 2016-02-27 00:08:08 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-02-27 00:08:08 +0000 |
| commit | 3477e662e60ba80a777f9126ba65ca6e9e0fcdf8 (patch) | |
| tree | 26aa99e97f980701131668a00a24fcb85c5cd8a8 /pkgs/tools/X11 | |
| parent | b4dadff5429d0bf47bcdafff14dd3d0032039699 (diff) | |
| parent | 766ad682f146a755b460dd87006912a96d915bcd (diff) | |
| download | nixlib-3477e662e60ba80a777f9126ba65ca6e9e0fcdf8.tar nixlib-3477e662e60ba80a777f9126ba65ca6e9e0fcdf8.tar.gz nixlib-3477e662e60ba80a777f9126ba65ca6e9e0fcdf8.tar.bz2 nixlib-3477e662e60ba80a777f9126ba65ca6e9e0fcdf8.tar.lz nixlib-3477e662e60ba80a777f9126ba65ca6e9e0fcdf8.tar.xz nixlib-3477e662e60ba80a777f9126ba65ca6e9e0fcdf8.tar.zst nixlib-3477e662e60ba80a777f9126ba65ca6e9e0fcdf8.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/tools/X11')
| -rw-r--r-- | pkgs/tools/X11/arandr/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/X11/winswitch/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/X11/xpra/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/X11/xpra/gtk3.nix | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix index a6af7b996512..68355d0d8aa8 100644 --- a/pkgs/tools/X11/arandr/default.nix +++ b/pkgs/tools/X11/arandr/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python, xrandr, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "arandr-0.1.8"; src = fetchurl { diff --git a/pkgs/tools/X11/winswitch/default.nix b/pkgs/tools/X11/winswitch/default.nix index ad7ac7c64c82..767edbc47d56 100644 --- a/pkgs/tools/X11/winswitch/default.nix +++ b/pkgs/tools/X11/winswitch/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonPackages +{ stdenv, fetchurl, buildPythonApplication, pythonPackages , which, xpra, xmodmap }: let - base = buildPythonPackage rec { + base = buildPythonApplication rec { name = "winswitch-${version}"; namePrefix = ""; version = "0.12.16"; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index c5b8db591c4c..e0e12051bffd 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonPackages +{ stdenv, fetchurl, buildPythonApplication, pythonPackages , python, cython, pkgconfig , xorg, gtk, glib, pango, cairo, gdk_pixbuf, atk, pycairo , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config , ffmpeg, x264, libvpx, libwebp , libfakeXinerama }: -buildPythonPackage rec { +buildPythonApplication rec { name = "xpra-0.15.3"; namePrefix = ""; diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix index 6e485dc0a052..5b81ec0a7edc 100644 --- a/pkgs/tools/X11/xpra/gtk3.nix +++ b/pkgs/tools/X11/xpra/gtk3.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, buildPythonPackage +{ stdenv, fetchurl, buildPythonApplication , python, cython, pkgconfig , xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk, pygobject3, pycairo, gobjectIntrospection , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config , ffmpeg, x264, libvpx, libwebp , libfakeXinerama }: -buildPythonPackage rec { +buildPythonApplication rec { name = "xpra-0.14.19"; namePrefix = ""; |