diff options
author | Connor Baker <connor.baker@tweag.io> | 2023-12-04 13:39:47 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-04 13:39:47 -0500 |
commit | 92df577d8797e5b1f033654cc2109e56179707f2 (patch) | |
tree | 86f0371e9de7926c2e3c207feef0232fe78e5861 | |
parent | c661b7d77e8271e47511a4247e6ab95673d853aa (diff) | |
parent | 5ac7bc5197516267524bfc740456f700867745fb (diff) |
Merge pull request #271720 from ConnorBaker/fix/ncurses-no-unicode
ncurses: gate postFixup related to unicode support (closes #271716)
-rw-r--r-- | pkgs/development/libraries/ncurses/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 9c1c8b422a98a..2d383c876cba4 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -89,14 +89,16 @@ stdenv.mkDerivation (finalAttrs: { doCheck = false; - # When building a wide-character (Unicode) build, create backward - # compatibility links from the the "normal" libraries to the - # wide-character libraries (e.g. libncurses.so to libncursesw.so). postFixup = let abiVersion-extension = if stdenv.isDarwin then "${abiVersion}.$dylibtype" else "$dylibtype.${abiVersion}"; in '' # Determine what suffixes our libraries have suffix="$(awk -F': ' 'f{print $3; f=0} /default library suffix/{f=1}' config.log)" + '' + # When building a wide-character (Unicode) build, create backward + # compatibility links from the the "normal" libraries to the + # wide-character libraries (e.g. libncurses.so to libncursesw.so). + + lib.optionalString unicodeSupport '' libs="$(ls $dev/lib/pkgconfig | tr ' ' '\n' | sed "s,\(.*\)$suffix\.pc,\1,g")" suffixes="$(echo "$suffix" | awk '{for (i=1; i < length($0); i++) {x=substr($0, i+1, length($0)-i); print x}}')" @@ -139,10 +141,13 @@ stdenv.mkDerivation (finalAttrs: { ln -svf ''${library}$suffix.pc $dev/lib/pkgconfig/$library$newsuffix.pc done done + '' + # Unconditional patches. Leading newline is to avoid mass rebuilds. + + '' # add pkg-config aliases for libraries that are built-in to libncurses(w) for library in tinfo tic; do - for suffix in "" w; do + for suffix in "" ${lib.optionalString unicodeSupport "w"}; do ln -svf ncurses$suffix.pc $dev/lib/pkgconfig/$library$suffix.pc done done |