Merge pull request #113242 from lopsided98/uwsgi-cross

uwsgi: fix cross-compilation
This commit is contained in:
Guillaume Girol 2021-07-14 14:22:22 +00:00 committed by GitHub
commit 05e46e3e1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -14,13 +14,13 @@ let php-embed = php.override {
};
pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "3"}" {
interpreter = pkg.interpreter;
interpreter = pkg.pythonForBuild.interpreter;
path = "plugins/python";
inputs = [ pkg ncurses ];
install = ''
install -Dm644 uwsgidecorators.py $out/${pkg.sitePackages}/uwsgidecorators.py
${pkg.executable} -m compileall $out/${pkg.sitePackages}/
${pkg.executable} -O -m compileall $out/${pkg.sitePackages}/
${pkg.pythonForBuild.executable} -m compileall $out/${pkg.sitePackages}/
${pkg.pythonForBuild.executable} -O -m compileall $out/${pkg.sitePackages}/
'';
};
@ -91,6 +91,13 @@ stdenv.mkDerivation rec {
inherit python2 python3;
};
postPatch = ''
for f in uwsgiconfig.py plugins/*/uwsgiplugin.py; do
substituteInPlace "$f" \
--replace pkg-config "$PKG_CONFIG"
done
'';
configurePhase = ''
export pluginDir=$out/lib/uwsgi
substituteAll ${./nixos.ini} buildconf/nixos.ini