From ce355bdafa2a7d6c42df006a464b96de219e7e36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Mon, 6 Mar 2017 13:06:51 +0100 Subject: [PATCH] xpra: install data files to correct location in $out The patch is no longer needed, with the wheel-based method that we use now data_files *are* relative to the prefix. --- pkgs/tools/X11/xpra/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 6349633af66..943707c0c5e 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -53,12 +53,6 @@ in buildPythonApplication rec { ''; setupPyBuildFlags = ["--with-Xdummy" "--without-strict"]; - preInstall = '' - # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix - ${python}/bin/${python.executable} setup.py install_data --install-dir=$out --root=$out - sed -i '/ = data_files/d' setup.py - ''; - postInstall = '' wrapProgram $out/bin/xpra \ --set XPRA_INSTALL_PREFIX "$out" \