cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

texinfo: fix issue with libiconv not being passed in by removing top-level with lib statement (#308835)

Browse source
This commit is contained in:
Philip Taron 2024-05-03 11:09:14 -07:00 committed by GitHub
parent 512b6d9ad2
commit 33ae86a951
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/tools/misc/texinfo/common.nix
View file

@ -1,7 +1,7 @@
{ version, sha256, patches ? [] }: { version, sha256, patches ? [] }:
{ lib, stdenv, buildPackages, fetchurl, perl, xz, libintl, bash { lib, stdenv, buildPackages, fetchurl, perl, xz, libintl, bash
, gnulib, gawk , gnulib, gawk, libiconv
# we are a dependency of gcc, this simplifies bootstraping # we are a dependency of gcc, this simplifies bootstraping
, interactive ? false, ncurses, procps , interactive ? false, ncurses, procps
@ -13,11 +13,10 @@
# files. # files.
let let
inherit (lib) getDev getLib optional optionals optionalString;
crossBuildTools = stdenv.hostPlatform != stdenv.buildPlatform; crossBuildTools = stdenv.hostPlatform != stdenv.buildPlatform;
in in
with lib;
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "texinfo${optionalString interactive "-interactive"}"; pname = "texinfo${optionalString interactive "-interactive"}";
inherit version; inherit version;
@ -83,7 +82,7 @@ stdenv.mkDerivation {
done done
''; '';
meta = { meta = with lib; {
description = "The GNU documentation system"; description = "The GNU documentation system";
homepage = "https://www.gnu.org/software/texinfo/"; homepage = "https://www.gnu.org/software/texinfo/";
changelog = "https://git.savannah.gnu.org/cgit/texinfo.git/plain/NEWS"; changelog = "https://git.savannah.gnu.org/cgit/texinfo.git/plain/NEWS";