about summary refs log tree commit diff
path: root/pkgs/shells
diff options
context:
space:
mode:
authorNick Cao <nickcao@nichi.co>2023-04-08 15:31:20 +0800
committerGitHub <noreply@github.com>2023-04-08 15:31:20 +0800
commit0d3d2a2231c762e59ac876b3920e569d5cf40646 (patch)
tree513a180b06c2106a5f6abf5347c7535dd4ab17b0 /pkgs/shells
parentde33bfe022ec51c11903bf6f1380a44e38843018 (diff)
parent18f4e2dc98292f213f0cb698f98315c7820e3b62 (diff)
Merge pull request #224001 from NickCao/tcsh-cross
tcsh: fix cross compilation
Diffstat (limited to 'pkgs/shells')
-rw-r--r--pkgs/shells/tcsh/default.nix15
1 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix
index 1676d2f084503..72c97a46e3c2f 100644
--- a/pkgs/shells/tcsh/default.nix
+++ b/pkgs/shells/tcsh/default.nix
@@ -1,9 +1,9 @@
 { lib
 , stdenv
 , fetchurl
-, fetchpatch
 , libxcrypt
 , ncurses
+, buildPackages
 }:
 
 stdenv.mkDerivation rec {
@@ -16,19 +16,16 @@ stdenv.mkDerivation rec {
   };
 
   strictDeps = true;
+
+  depsBuildBuild = [
+    buildPackages.stdenv.cc
+  ];
+
   buildInputs = [
     libxcrypt
     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)";