From 6ae3b95f56fa98c3ac145212969906b84b02fbf4 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 31 Mar 2023 09:35:05 +0800 Subject: [PATCH 1/2] tcsh: fix cross compilation --- pkgs/shells/tcsh/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix index 1676d2f0845..b5f87a1ef65 100644 --- a/pkgs/shells/tcsh/default.nix +++ b/pkgs/shells/tcsh/default.nix @@ -4,6 +4,7 @@ , fetchpatch , libxcrypt , ncurses +, buildPackages }: stdenv.mkDerivation rec { @@ -16,6 +17,11 @@ stdenv.mkDerivation rec { }; strictDeps = true; + + depsBuildBuild = [ + buildPackages.stdenv.cc + ]; + buildInputs = [ libxcrypt ncurses From 18f4e2dc98292f213f0cb698f98315c7820e3b62 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 31 Mar 2023 10:16:07 +0800 Subject: [PATCH 2/2] tcsh: drop outdated patch for musl --- pkgs/shells/tcsh/default.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix index b5f87a1ef65..72c97a46e3c 100644 --- a/pkgs/shells/tcsh/default.nix +++ b/pkgs/shells/tcsh/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , libxcrypt , ncurses , buildPackages @@ -27,14 +26,6 @@ stdenv.mkDerivation rec { ncurses ]; - patches = lib.optional stdenv.hostPlatform.isMusl - # Use system malloc - (fetchpatch { - name = "sysmalloc.patch"; - url = "https://git.alpinelinux.org/aports/plain/community/tcsh/001-sysmalloc.patch?id=184585c046cdd56512f1a76e426dd799b368f8cf"; - sha256 = "1qc6ydxhdfizsbkaxhpn3wib8sfphrw10xnnsxx2prvzg9g2zp67"; - }); - meta = with lib; { homepage = "https://www.tcsh.org/"; description = "An enhanced version of the Berkeley UNIX C shell (csh)";