diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2018-09-06 19:40:24 +0000 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-11-18 11:19:20 +0100 |
| commit | 60ba7d233e49e8b9b3ecde68b6b0f25f1bbe92de (patch) | |
| tree | d99a0683745bce0513e1da0c9d76e4b065f77023 /pkgs/development/tools/glslviewer | |
| parent | 0d0d7dcd06a01bb9ab8f17ee15efd0334677eec4 (diff) | |
pythonPackages.requests: disable multiple outputs
The `dev` output is empty anyway.
The problem is that it interacts badly with other parts of python and
stdenv infrastructure. In particular, before this patch it installs
code into `out` output (with only generated `nix-support` in `dev`),
but `makePythonPath` then uses `propagatedBuildInputs` to generate
`PYTHONPATH` while stdenv selects `dev` outputs for
`propagatedBuiltInputs`. This results in `makePythonPath` linking to
the empty `dev` output in `PYTHONPATH`.
This reverts a piece of commit 28299f669adc41e5278372cad952fb1e1165b44b.
Diffstat (limited to 'pkgs/development/tools/glslviewer')
| -rw-r--r-- | pkgs/development/tools/glslviewer/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index fbae0a76f254..e8315e7b60c2 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { libXi libX11 ] ++ (with python2Packages; [ python setuptools wrapPython ]) ++ stdenv.lib.optional stdenv.isDarwin Cocoa; - pythonPath = with python2Packages; [ requests.dev ]; + pythonPath = with python2Packages; [ requests ]; # Makefile has /usr/local/bin hard-coded for 'make install' preConfigure = '' |