diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-11-19 22:02:16 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-11-19 22:02:16 +0000 |
| commit | 1051c44d9cccf978419198fd7598d03a9904b02d (patch) | |
| tree | ae28aaa14534e5376dc6c19ef092df563e5a792b /pkgs | |
| parent | cdcbad35d7374f63a50a8fde7c809e1ab8e5ad17 (diff) | |
| download | nixlib-1051c44d9cccf978419198fd7598d03a9904b02d.tar nixlib-1051c44d9cccf978419198fd7598d03a9904b02d.tar.gz nixlib-1051c44d9cccf978419198fd7598d03a9904b02d.tar.bz2 nixlib-1051c44d9cccf978419198fd7598d03a9904b02d.tar.lz nixlib-1051c44d9cccf978419198fd7598d03a9904b02d.tar.xz nixlib-1051c44d9cccf978419198fd7598d03a9904b02d.tar.zst nixlib-1051c44d9cccf978419198fd7598d03a9904b02d.zip | |
* Don't use /bin/sh.
* Don't clear the PATH. svn path=/nixpkgs/trunk/; revision=7077
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/upstart/cfgdir.patch | 16 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/upstart/default.nix | 1 |
2 files changed, 12 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/upstart/cfgdir.patch b/pkgs/os-specific/linux/upstart/cfgdir.patch index 7583ca85760e..dbdcb62e1e95 100644 --- a/pkgs/os-specific/linux/upstart/cfgdir.patch +++ b/pkgs/os-specific/linux/upstart/cfgdir.patch @@ -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 diff --git a/pkgs/os-specific/linux/upstart/default.nix b/pkgs/os-specific/linux/upstart/default.nix index 3ff46e24b8c9..ec185261cbc2 100644 --- a/pkgs/os-specific/linux/upstart/default.nix +++ b/pkgs/os-specific/linux/upstart/default.nix @@ -8,4 +8,5 @@ stdenv.mkDerivation { }; configureFlags = "--enable-compat"; patches = [./cfgdir.patch]; + preBuild = "export NIX_CFLAGS_COMPILE=\"$NIX_CFLAGS_COMPILE -DSHELL=\\\"$SHELL\\\"\""; } |