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

libcIconv: rename from glibcIconv

Browse Source 
There's nothing Glibc-specific about this function — it's already used
for musl and wasilibc as well!  I haven't bothered with an alias as I
think it's highly unlikely anybody uses this function outside Nixpkgs.
This commit is contained in:
Alyssa Ross 2023-01-22 19:29:48 +00:00
parent 4e9efbd52a
commit be62259393
No known key found for this signature in database
GPG Key ID: F9DBED4859B271C0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21144,7 +21144,7 @@ with pkgs;
# just in case you want it regardless of platform.
libiconv =
if lib.elem stdenv.hostPlatform.libc ["glibc" "musl" "wasilibc"]
then glibcIconv (if stdenv.hostPlatform != stdenv.buildPlatform
then libcIconv (if stdenv.hostPlatform != stdenv.buildPlatform
then libcCross
else stdenv.cc.libc)
else if stdenv.hostPlatform.isDarwin
@ -21153,7 +21153,7 @@ with pkgs;
then null
else libiconvReal;
glibcIconv = libc: let
libcIconv = libc: let
inherit (libc) pname version;
libcDev = lib.getDev libc;
in runCommand "${pname}-iconv-${version}" { strictDeps = true; } ''