alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* Don't use /bin/sh.

Browse source 
* Don't clear the PATH.

svn path=/nixpkgs/trunk/; revision=7077
This commit is contained in:
Eelco Dolstra 2006-11-19 22:02:16 +00:00
parent cdcbad35d7
commit 1051c44d9c
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/os-specific/linux/upstart/cfgdir.patch
View file

@ -1,16 +1,19 @@
diff -rc upstart-0.3.0-orig/init/main.c upstart-0.3.0/init/main.c
*** upstart-0.3.0-orig/init/main.c 2006-10-13 14:35:16.000000000 +0200
--- upstart-0.3.0/init/main.c 2006-11-19 17:02:47.000000000 +0100
--- upstart-0.3.0/init/main.c 2006-11-19 21:41:01.000000000 +0100
***************
*** 206,212 ****
*** 206,215 ****
control_open ();
/* Read configuration */
! cfg_watch_dir (NULL, CFG_DIR, NULL);
/* Set the PATH environment variable */
setenv ("PATH", PATH, TRUE);
--- 206,214 ----
! setenv ("PATH", PATH, TRUE);
/* Generate and run the startup event or read the state from the
--- 206,217 ----
control_open ();
/* Read configuration */
@ -19,4 +22,7 @@ diff -rc upstart-0.3.0-orig/init/main.c upstart-0.3.0/init/main.c
! cfg_watch_dir (NULL, cfg_dir, NULL);
/* Set the PATH environment variable */
setenv ("PATH", PATH, TRUE);
! /* setenv ("PATH", PATH, TRUE); */
/* Generate and run the startup event or read the state from the

1
pkgs/os-specific/linux/upstart/default.nix
View file

@ -8,4 +8,5 @@ stdenv.mkDerivation {
};
configureFlags = "--enable-compat";
patches = [./cfgdir.patch];
preBuild = "export NIX_CFLAGS_COMPILE=\"$NIX_CFLAGS_COMPILE -DSHELL=\\\"$SHELL\\\"\"";
}