diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-01-22 19:31:16 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-01-22 21:11:41 +0000 |
| commit | b19185fdb2a5ffbbdb5689ef5ee30d17d208e217 (patch) | |
| tree | 479cc60d43c0d69a1b72f408e3048a8d04aaaa42 /pkgs | |
| parent | be62259393a3cff405b9d84015f1a60d9150b355 (diff) | |
| download | nixpkgs-b19185fdb2a5ffbbdb5689ef5ee30d17d208e217.tar nixpkgs-b19185fdb2a5ffbbdb5689ef5ee30d17d208e217.tar.gz nixpkgs-b19185fdb2a5ffbbdb5689ef5ee30d17d208e217.tar.bz2 nixpkgs-b19185fdb2a5ffbbdb5689ef5ee30d17d208e217.tar.lz nixpkgs-b19185fdb2a5ffbbdb5689ef5ee30d17d208e217.tar.xz nixpkgs-b19185fdb2a5ffbbdb5689ef5ee30d17d208e217.tar.zst nixpkgs-b19185fdb2a5ffbbdb5689ef5ee30d17d208e217.zip | |
libiconv: use libc header on NetBSD
Let's be consistent about this. Updated netbsd.libc to have a pname attribute so it's compatible with libcIconv.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/bsd/netbsd/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 37a0c35b186..8903db9f36b 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -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 = [ ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97661453c27..a2f9b2fa7b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 |