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

fetchurl: switch to the usual curl

Browse Source 
I verified that krb5 doesn't need yacc in lib-only build,
simplifying the circular-reference cut.
This commit is contained in:
Vladimír Čunát 2017-12-17 11:21:12 +01:00
parent 68432fd1c9
commit 3c51628a4c
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,9 +22,10 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-tcl=no" "--localstatedir=/var/lib"] configureFlags = [ "--with-tcl=no" "--localstatedir=/var/lib"]
++ optional stdenv.isFreeBSD ''WARN_CFLAGS=""''; ++ optional stdenv.isFreeBSD ''WARN_CFLAGS=""'';
nativeBuildInputs = [ pkgconfig perl yacc ] nativeBuildInputs = [ pkgconfig perl ]
++ optional (!libOnly) yacc
# Provides the mig command used by the build scripts # Provides the mig command used by the build scripts
++ optional stdenv.isDarwin bootstrap_cmds; ++ optional (stdenv.isDarwin && !libOnly) bootstrap_cmds;
buildInputs = [ openssl ] buildInputs = [ openssl ]
++ optionals (!libOnly) [ openldap libedit ]; ++ optionals (!libOnly) [ openldap libedit ];

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

@ -179,8 +179,7 @@ with pkgs;
# `fetchurl' downloads a file from the network. # `fetchurl' downloads a file from the network.
fetchurl = import ../build-support/fetchurl { fetchurl = import ../build-support/fetchurl {
inherit stdenv; inherit stdenv curl;
curl = curl.override { gssSupport = false; };
}; };
fetchRepoProject = callPackage ../build-support/fetchrepoproject { }; fetchRepoProject = callPackage ../build-support/fetchrepoproject { };
@ -8760,7 +8759,10 @@ with pkgs;
krb5Full = callPackage ../development/libraries/kerberos/krb5.nix { krb5Full = callPackage ../development/libraries/kerberos/krb5.nix {
inherit (darwin) bootstrap_cmds; inherit (darwin) bootstrap_cmds;
}; };
libkrb5 = krb5Full.override { type = "lib"; }; libkrb5 = krb5Full.override {
fetchurl = fetchurlBoot;
type = "lib";
};
languageMachines = recurseIntoAttrs (import ../development/libraries/languagemachines/packages.nix { inherit callPackage; }); languageMachines = recurseIntoAttrs (import ../development/libraries/languagemachines/packages.nix { inherit callPackage; });