From 540db34fff8d27e944120749fef268115f651215 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Tue, 24 Nov 2015 22:05:49 +0100
Subject: [PATCH] sbcl: remove obsolete dependency on which
---
pkgs/development/compilers/sbcl/default.nix | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index c464d9856fc3..7b2cadc31d58 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, sbclBootstrap, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit", which }:
+{ stdenv, fetchurl, sbclBootstrap, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" }:
stdenv.mkDerivation rec {
name = "sbcl-${version}";
@@ -9,8 +9,6 @@ stdenv.mkDerivation rec {
sha256 = "1cwrmvbx8m7n7wkcm16yz7qwx221giz7jskzkvy42pj919may36n";
};
- buildInputs = [ which ];
-
patchPhase = ''
echo '"${version}.nixos"' > version.lisp-expr
echo "
@@ -40,7 +38,7 @@ stdenv.mkDerivation rec {
'/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))'
# Fix software version retrieval
- sed -e "s@/bin/uname@$(which uname)@g" -i src/code/*-os.lisp
+ sed -e "s@/bin/uname@$(command -v uname)@g" -i src/code/*-os.lisp
# Fix the tests
sed -e '/deftest pwent/inil' -i contrib/sb-posix/posix-tests.lisp