Unverified Commit 1c6a1e56 authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #218500 from alyssais/pythonForBuild

parents ff7dfcba 2bfa93e0

doc/languages-frameworks/python.section.md

+2 −2
Original line number Diff line number Diff line
@@ -1019,7 +1019,7 @@ buildPythonPackage rec { 


The `buildPythonPackage` mainly does four things:



* In the `buildPhase`, it calls `${python.interpreter} setup.py bdist_wheel` to

* In the `buildPhase`, it calls `${python.pythonForBuild.interpreter} setup.py bdist_wheel` to

  build a wheel binary zipfile.

* In the `installPhase`, it installs the wheel file using `pip install *.whl`.

* In the `postFixup` phase, the `wrapPythonPrograms` bash function is called to
@@ -1546,7 +1546,7 @@ of such package using the feature is `pkgs/tools/X11/xpra/default.nix`. 
As workaround install it as an extra `preInstall` step:



```shell

${python.interpreter} setup.py install_data --install-dir=$out --root=$out

${python.pythonForBuild.interpreter} setup.py install_data --install-dir=$out --root=$out

sed -i '/ = data\_files/d' setup.py

```

pkgs/applications/misc/calibre/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ stdenv.mkDerivation rec { 
    export XDG_DATA_HOME=$out/share

    export XDG_UTILS_INSTALL_MODE="user"



    ${python3Packages.python.interpreter} setup.py install --root=$out \

    ${python3Packages.python.pythonForBuild.interpreter} setup.py install --root=$out \

      --prefix=$out \

      --libdir=$out/lib \

      --staging-root=$out \

pkgs/applications/networking/mailreaders/afew/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { 
  outputs = [ "out" "doc" ];



  postBuild =  ''

    ${python3Packages.python.interpreter} setup.py build_sphinx -b html,man

    ${python3Packages.python.pythonForBuild.interpreter} setup.py build_sphinx -b html,man

  '';



  postInstall = ''

pkgs/applications/networking/p2p/zeronet-conservancy/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { 
  ];



  buildPhase = ''

    ${python3Packages.python.interpreter} -O -m compileall .

    ${python3Packages.python.pythonForBuild.interpreter} -O -m compileall .

  '';



  installPhase = ''

pkgs/applications/networking/p2p/zeronet/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { 
  ];



  buildPhase = ''

    ${python3Packages.python.interpreter} -O -m compileall .

    ${python3Packages.python.pythonForBuild.interpreter} -O -m compileall .

  '';



  installPhase = ''