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

Merge pull request #7245 from spwhitt/krb5

Browse Source 
krb5: fix Darwin build by providing mig
This commit is contained in:
Arseniy Seroka 2015-04-07 20:30:57 +03:00
commit 28a470859b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/kerberos/krb5.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, perl, ncurses, yacc, openssl, openldap }: { stdenv, fetchurl, pkgconfig, perl, ncurses, yacc, openssl, openldap, bootstrap_cmds }:
let let
pname = "krb5"; pname = "krb5";
@ -15,7 +15,9 @@ stdenv.mkDerivation (rec {
sha256 = "0gk6jvr64rf6l4xcyxn8i3fr5d1j7dhqvwyv3vw2qdkzz7yjkxjd"; 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 = '' unpackPhase = ''
tar -xf $src tar -xf $src
@ -31,7 +33,7 @@ stdenv.mkDerivation (rec {
description = "MIT Kerberos 5"; description = "MIT Kerberos 5";
homepage = webpage; homepage = webpage;
license = "MPL"; license = "MPL";
platforms = platforms.linux; platforms = platforms.unix;
maintainers = with maintainers; [ wkennington ]; maintainers = with maintainers; [ wkennington ];
}; };

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

@ -6172,6 +6172,7 @@ let
openldap = openldap.override { openldap = openldap.override {
cyrus_sasl = cyrus_sasl.override { kerberos = null; }; cyrus_sasl = cyrus_sasl.override { kerberos = null; };
}; };
inherit (darwin) bootstrap_cmds;
}; };
LASzip = callPackage ../development/libraries/LASzip { }; LASzip = callPackage ../development/libraries/LASzip { };