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

libiconv: use libc header on NetBSD

Browse Source 
Let's be consistent about this.

Updated netbsd.libc to have a pname attribute so it's compatible with
libcIconv.
This commit is contained in:
Alyssa Ross 2023-01-22 19:31:16 +00:00
parent be62259393
commit b19185fdb2
No known key found for this signature in database
GPG Key ID: F9DBED4859B271C0
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/os-specific/bsd/netbsd/default.nix
View File

@ -54,7 +54,8 @@ in makeScopeWithSplicing
mkDerivation = lib.makeOverridable (attrs: let
stdenv' = if attrs.noCC or false then stdenvNoCC else stdenv;
in stdenv'.mkDerivation ({
name = "${attrs.pname or (baseNameOf attrs.path)}-netbsd-${attrs.version}";
pname = "${attrs.pname or (baseNameOf attrs.path)}-netbsd";
inherit (attrs) version;
src = fetchNetBSD attrs.path attrs.version attrs.sha256;
extraPaths = [ ];

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

@ -21143,14 +21143,12 @@ with pkgs;
# We also provide `libiconvReal`, which will always be a standalone libiconv,
# just in case you want it regardless of platform.
libiconv =
if lib.elem stdenv.hostPlatform.libc ["glibc" "musl" "wasilibc"]
if lib.elem stdenv.hostPlatform.libc [ "glibc" "musl" "nblibc" "wasilibc" ]
then libcIconv (if stdenv.hostPlatform != stdenv.buildPlatform
then libcCross
else stdenv.cc.libc)
else if stdenv.hostPlatform.isDarwin
then darwin.libiconv
else if stdenv.hostPlatform.isNetBSD
then null
else libiconvReal;
libcIconv = libc: let