tjh.dev
Fixed a /bin/echo reference
svn path=/nixpkgs/trunk/; revision=8995
+12
pkgs/tools/misc/findutils/change_echo_path.patch
+12
pkgs/tools/misc/findutils/change_echo_path.patch
···
1
+
diff -Naur findutils-4.2.30/xargs/xargs.c findutils-4.2.30_new/xargs/xargs.c
2
+
--- findutils-4.2.30/xargs/xargs.c 2007-02-27 11:21:08.000000000 +0100
3
+
+++ findutils-4.2.30_new/xargs/xargs.c 2007-07-17 19:02:05.000000000 +0200
4
+
@@ -402,7 +402,7 @@
5
+
int show_limits = 0; /* --show-limits */
6
+
int always_run_command = 1;
7
+
char *input_file = "-"; /* "-" is stdin */
8
+
- char *default_cmd = "/bin/echo";
9
+
+ char *default_cmd = "echo";
10
+
int (*read_args) PARAMS ((void)) = read_line;
11
+
void (*act_on_init_result)(void) = noop;
12
+
int env_too_big = 0;
+2
-1
pkgs/tools/misc/findutils/default.nix
+2
-1
pkgs/tools/misc/findutils/default.nix
···
7
7
sha256 = "1x1s0h1gf4hxh6xi6vq336sz8zsh4hvnsslc7607z41l82xrqjrl";
8
8
};
9
9
buildInputs = [coreutils];
10
-
patches = [./findutils-path.patch]
10
+
patches = [ ./findutils-path.patch ./change_echo_path.patch ]
11
+
11
12
# Note: the dietlibc patch is just to get findutils to compile.
12
13
# The locate command probably won't work though.
13
14
++ stdenv.lib.optional (stdenv ? isDietLibC) ./dietlibc-hack.patch;