public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mod_wsgi: allow building this module with python 2.x and 3.x

Browse Source
This commit is contained in:
Peter Simons 2019-08-27 14:26:17 +02:00
parent 630e25ba5c
commit 79c6d22c1f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/http/apache-modules/mod_wsgi/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, apacheHttpd, python2 }: { stdenv, fetchurl, apacheHttpd, python, ncurses }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mod_wsgi-${version}"; name = "mod_wsgi-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1j8pqn0xhd502ardlmkqx8y85s1npmk9nifqps60wjh29nny03f2"; sha256 = "1j8pqn0xhd502ardlmkqx8y85s1npmk9nifqps60wjh29nny03f2";
}; };
buildInputs = [ apacheHttpd python2 ]; buildInputs = [ apacheHttpd python ncurses ];
patchPhase = '' patchPhase = ''
sed -r -i -e "s|^LIBEXECDIR=.*$|LIBEXECDIR=$out/modules|" \ sed -r -i -e "s|^LIBEXECDIR=.*$|LIBEXECDIR=$out/modules|" \

4
pkgs/top-level/all-packages.nix
View File

@ -14466,7 +14466,9 @@ in
mod_python = callPackage ../servers/http/apache-modules/mod_python { }; mod_python = callPackage ../servers/http/apache-modules/mod_python { };
mod_wsgi = callPackage ../servers/http/apache-modules/mod_wsgi { }; mod_wsgi = self.mod_wsgi2;
mod_wsgi2 = callPackage ../servers/http/apache-modules/mod_wsgi { python = python2; ncurses = null; };
mod_wsgi3 = callPackage ../servers/http/apache-modules/mod_wsgi { python = python3; };
php = pkgs.php.override { inherit apacheHttpd; }; php = pkgs.php.override { inherit apacheHttpd; };