mod_wsgi3: refactor derivation

+9 -7
+8 -6
pkgs/servers/http/apache-modules/mod_wsgi/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, apacheHttpd, python, ncurses }: 1 + { lib, stdenv, fetchFromGitHub, apacheHttpd, python3, ncurses }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "mod_wsgi"; ··· 11 11 hash = "sha256-6rRHdgdTb94kqIpWJOJOwoIsaXb/c4XY3q331GwQyf0="; 12 12 }; 13 13 14 - buildInputs = [ apacheHttpd python ncurses ]; 14 + buildInputs = [ apacheHttpd python3 ncurses ]; 15 15 16 - patchPhase = '' 17 - sed -r -i -e "s|^LIBEXECDIR=.*$|LIBEXECDIR=$out/modules|" \ 18 - ${if stdenv.isDarwin then "-e 's|/usr/bin/lipo|lipo|'" else ""} \ 19 - configure 16 + postPatch = '' 17 + substituteInPlace configure --replace '/usr/bin/lipo' 'lipo' 20 18 ''; 19 + 20 + makeFlags = [ 21 + "LIBEXECDIR=$(out)/modules" 22 + ]; 21 23 22 24 meta = { 23 25 homepage = "https://github.com/GrahamDumpleton/mod_wsgi";
+1 -1
pkgs/top-level/all-packages.nix
··· 23711 23711 23712 23712 mod_wsgi = self.mod_wsgi2; 23713 23713 mod_wsgi2 = throw "mod_wsgi2 has been removed since Python 2 is EOL. Use mod_wsgi3 instead"; 23714 - mod_wsgi3 = callPackage ../servers/http/apache-modules/mod_wsgi { python = python3; }; 23714 + mod_wsgi3 = callPackage ../servers/http/apache-modules/mod_wsgi { }; 23715 23715 23716 23716 mod_itk = callPackage ../servers/http/apache-modules/mod_itk { }; 23717 23717