Merge branch 'nixpkgs-update' into master

1 files changed, 7 insertions, 5 deletions

diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix
index 39c568d1d49..1b8ef94fae9 100644
--- a/pkgs/servers/http/apache-modules/mod_python/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_python/default.nix
@@ -1,10 +1,11 @@
-{ stdenv, fetchurl, apacheHttpd, python2 }:
+{ lib, stdenv, fetchurl, apacheHttpd, python2, libintl }:
 
 stdenv.mkDerivation rec {
-  name = "mod_python-3.5.0";
+  pname = "mod_python";
+  version = "3.5.0";
 
   src = fetchurl {
-    url = "http://dist.modpython.org/dist/${name}.tgz";
+    url = "http://dist.modpython.org/dist/${pname}-${version}.tgz";
     sha256 = "146apll3yfqk05s8fkf4acmxzqncl08bgn4rv0c1rd4qxmc91w0f";
   };
 
@@ -24,11 +25,12 @@ stdenv.mkDerivation rec {
 
   passthru = { inherit apacheHttpd; };
 
-  buildInputs = [ apacheHttpd python2 ];
+  buildInputs = [ apacheHttpd python2 ]
+    ++ lib.optional stdenv.isDarwin libintl;
 
   meta = {
     homepage = "http://modpython.org/";
     description = "An Apache module that embeds the Python interpreter within the server";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }