diff options
| author | Domen Kožar <domen@dev.si> | 2016-01-17 21:14:49 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2016-01-17 21:14:49 +0100 |
| commit | 9e8eba48ab46ecff67dfb27571b9adb0e2602f15 (patch) | |
| tree | 85230857fc3841313188c657cb1390c3ddc8d061 /pkgs/tools/X11/xpra | |
| parent | 4a0692a5fb9dc38b49deeda174c37a0864e052f3 (diff) | |
| download | nixlib-9e8eba48ab46ecff67dfb27571b9adb0e2602f15.tar nixlib-9e8eba48ab46ecff67dfb27571b9adb0e2602f15.tar.gz nixlib-9e8eba48ab46ecff67dfb27571b9adb0e2602f15.tar.bz2 nixlib-9e8eba48ab46ecff67dfb27571b9adb0e2602f15.tar.lz nixlib-9e8eba48ab46ecff67dfb27571b9adb0e2602f15.tar.xz nixlib-9e8eba48ab46ecff67dfb27571b9adb0e2602f15.tar.zst nixlib-9e8eba48ab46ecff67dfb27571b9adb0e2602f15.zip | |
xorg.xorgserver: wrap Xvfb with required flags
Diffstat (limited to 'pkgs/tools/X11/xpra')
| -rw-r--r-- | pkgs/tools/X11/xpra/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/X11/xpra/gtk3.nix | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index b1fdd96adb5d..c5b8db591c4c 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -33,10 +33,6 @@ buildPythonPackage rec { pillow pygtk pygobject ]; - postPatch = '' - sed -i 's|DEFAULT_XVFB_COMMAND = "Xvfb|DEFAULT_XVFB_COMMAND = "Xvfb -xkbdir ${xkeyboard_config}/etc/X11/xkb|' xpra/platform/features.py - ''; - preBuild = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)" ''; diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix index 04bcd1195147..6e485dc0a052 100644 --- a/pkgs/tools/X11/xpra/gtk3.nix +++ b/pkgs/tools/X11/xpra/gtk3.nix @@ -33,10 +33,6 @@ buildPythonPackage rec { pygobject3 pycairo cython ]; - postPatch = '' - sed -i 's|DEFAULT_XVFB_COMMAND = "Xvfb|DEFAULT_XVFB_COMMAND = "Xvfb -xkbdir ${xkeyboard_config}/etc/X11/xkb|' xpra/platform/features.py - ''; - preBuild = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-3.0) $(pkg-config --cflags xtst)" ''; |