diff options
| author | Benno Fünfstück <benno.fuenfstueck@gmail.com> | 2017-03-06 13:06:51 +0100 |
|---|---|---|
| committer | Benno Fünfstück <benno.fuenfstueck@gmail.com> | 2017-03-06 13:06:51 +0100 |
| commit | ce355bdafa2a7d6c42df006a464b96de219e7e36 (patch) | |
| tree | f77e5ea49778fa00c17db7308ea32c20f3a70183 /pkgs/tools/X11/xpra/default.nix | |
| parent | dd23d08b9047b74254723e3e54086ce9b656b694 (diff) | |
| download | nixlib-ce355bdafa2a7d6c42df006a464b96de219e7e36.tar nixlib-ce355bdafa2a7d6c42df006a464b96de219e7e36.tar.gz nixlib-ce355bdafa2a7d6c42df006a464b96de219e7e36.tar.bz2 nixlib-ce355bdafa2a7d6c42df006a464b96de219e7e36.tar.lz nixlib-ce355bdafa2a7d6c42df006a464b96de219e7e36.tar.xz nixlib-ce355bdafa2a7d6c42df006a464b96de219e7e36.tar.zst nixlib-ce355bdafa2a7d6c42df006a464b96de219e7e36.zip | |
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.
Diffstat (limited to 'pkgs/tools/X11/xpra/default.nix')
| -rw-r--r-- | pkgs/tools/X11/xpra/default.nix | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 6349633af66b..943707c0c5ee 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" \ |