Merge pull request #7245 from spwhitt/krb5

krb5: fix Darwin build by providing mig
NixOS · Apr 7, 2015 · 28a4708 · 28a4708
2 parents 16ccc46 + 1c0f1ce
commit 28a4708
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, perl, ncurses, yacc, openssl, openldap }:
+{ stdenv, fetchurl, pkgconfig, perl, ncurses, yacc, openssl, openldap, bootstrap_cmds }:
 
 let
   pname = "krb5";
@@ -15,7 +15,9 @@ stdenv.mkDerivation (rec {
     sha256 = "0gk6jvr64rf6l4xcyxn8i3fr5d1j7dhqvwyv3vw2qdkzz7yjkxjd";
   };
 
-  buildInputs = [ pkgconfig perl ncurses yacc openssl openldap ];
+  buildInputs = [ pkgconfig perl ncurses yacc openssl openldap ]
+    # Provides the mig command used by the build scripts
+    ++ stdenv.lib.optional stdenv.isDarwin bootstrap_cmds ;
 
   unpackPhase = ''
     tar -xf $src
@@ -31,7 +33,7 @@ stdenv.mkDerivation (rec {
     description = "MIT Kerberos 5";
     homepage = webpage;
     license = "MPL";
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ wkennington ];
   };
 

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -6172,6 +6172,7 @@ let
     openldap = openldap.override {
       cyrus_sasl = cyrus_sasl.override { kerberos = null; };
     };
+    inherit (darwin) bootstrap_cmds;
   };
 
   LASzip = callPackage ../development/libraries/LASzip { };