b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #158517 from qowoz/darwin-bootstrap-hello

Browse source 
bootstrap-tools: disable iconv for the `hello` test
This commit is contained in:
Ben Siraphob 2022-02-07 23:59:33 +00:00 committed by GitHub
parent b60907a248 f5227f0643
commit 60c52a73f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/misc/hello/default.nix
View file

@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "hello";
version = "2.10";
version = "2.12";
src = fetchurl {
url = "mirror://gnu/hello/${pname}-${version}.tar.gz";
sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i";
sha256 = "1ayhp9v4m4rdhjmnl2bq3cibrbqqkgjbl3s7yk2nhlh8vj3ay16g";
};
doCheck = true;

3
pkgs/stdenv/darwin/make-bootstrap-tools.nix
View file

@ -351,7 +351,8 @@ in rec {
tar xvf ${hello.src}
cd hello-*
./configure --prefix=$out
# stdenv bootstrap tools ship a broken libiconv.dylib https://github.com/NixOS/nixpkgs/issues/158331
am_cv_func_iconv=no ./configure --prefix=$out
make
make install