nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-17 17:44:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix travis evaluation by providing explicit libiconv for the rare cases

Browse Source 
that need it, like uclibc
This commit is contained in:
Eric Seidel 2015-02-17 20:10:26 -08:00
parent a78d164b1e
commit d2a987d6e3
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/uclibc/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, linuxHeaders, libiconv, cross ? null, gccCross ? null, {stdenv, fetchurl, linuxHeaders, libiconvReal, cross ? null, gccCross ? null,
extraConfig ? ""}: extraConfig ? ""}:
assert stdenv.isLinux; assert stdenv.isLinux;
@ -95,7 +95,7 @@ stdenv.mkDerivation {
passthru = { passthru = {
# Derivations may check for the existance of this attribute, to know what to link to. # Derivations may check for the existance of this attribute, to know what to link to.
inherit libiconv; libiconv = libiconvReal;
}; };
meta = { meta = {

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

@ -6285,11 +6285,16 @@ let
libgsf = callPackage ../development/libraries/libgsf { }; libgsf = callPackage ../development/libraries/libgsf { };
# glibc provides libiconv so systems with glibc don't need to build libiconv
# separately, but we also provide libiconvReal, which will always be a
# standalone libiconv, just in case you want it
libiconv = libiconv =
if stdenv.isGlibc if stdenv.isGlibc
then stdenv.cc.libc then stdenv.cc.libc
else callPackage ../development/libraries/libiconv { }; else callPackage ../development/libraries/libiconv { };
libiconvReal = callPackage ../development/libraries/libiconv { };
# On non-GNU systems we need GNU Gettext for libintl. # On non-GNU systems we need GNU Gettext for libintl.
libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux) gettext; libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux) gettext;
@ -9163,7 +9168,7 @@ let
uclibc = callPackage ../os-specific/linux/uclibc { }; uclibc = callPackage ../os-specific/linux/uclibc { };
uclibcCross = lowPrio (callPackage ../os-specific/linux/uclibc { uclibcCross = lowPrio (callPackage ../os-specific/linux/uclibc {
inherit fetchurl stdenv libiconv; inherit fetchurl stdenv libiconvReal;
linuxHeaders = linuxHeadersCross; linuxHeaders = linuxHeadersCross;
gccCross = gccCrossStageStatic; gccCross = gccCrossStageStatic;
cross = assert crossSystem != null; crossSystem; cross = assert crossSystem != null; crossSystem;