diff options
| author | Eric Seidel <gridaphobe@gmail.com> | 2015-02-17 20:10:26 -0800 |
|---|---|---|
| committer | Eric Seidel <gridaphobe@gmail.com> | 2015-02-17 20:10:26 -0800 |
| commit | d2a987d6e36c7bca253bf08dfe22f2beaa3b2ee1 (patch) | |
| tree | 6dec2c26ea744dd300afe897ebe7052236d2e91c /pkgs/os-specific/linux/uclibc | |
| parent | a78d164b1e6c10f39c87b8907685a711a6de338c (diff) | |
| download | nixpkgs-d2a987d6e36c7bca253bf08dfe22f2beaa3b2ee1.tar nixpkgs-d2a987d6e36c7bca253bf08dfe22f2beaa3b2ee1.tar.gz nixpkgs-d2a987d6e36c7bca253bf08dfe22f2beaa3b2ee1.tar.bz2 nixpkgs-d2a987d6e36c7bca253bf08dfe22f2beaa3b2ee1.tar.lz nixpkgs-d2a987d6e36c7bca253bf08dfe22f2beaa3b2ee1.tar.xz nixpkgs-d2a987d6e36c7bca253bf08dfe22f2beaa3b2ee1.tar.zst nixpkgs-d2a987d6e36c7bca253bf08dfe22f2beaa3b2ee1.zip | |
fix travis evaluation by providing explicit libiconv for the rare cases
that need it, like uclibc
Diffstat (limited to 'pkgs/os-specific/linux/uclibc')
| -rw-r--r-- | pkgs/os-specific/linux/uclibc/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index b856a788348..88cf59cf8b7 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, linuxHeaders, libiconv, cross ? null, gccCross ? null, +{stdenv, fetchurl, linuxHeaders, libiconvReal, cross ? null, gccCross ? null, extraConfig ? ""}: assert stdenv.isLinux; @@ -95,7 +95,7 @@ stdenv.mkDerivation { passthru = { # Derivations may check for the existance of this attribute, to know what to link to. - inherit libiconv; + libiconv = libiconvReal; }; meta = { |