public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!!! Important notice. This commit should be already done at the time of nixpkgs-stdenv-updates-merge going to trunk. This commit should be reverted if you are using old nixpkgs trunk. I hope there will be no commits to nixos/ before merger...

Browse Source 
svn path=/nixos/trunk/; revision=10824
This commit is contained in:
Michael Raskin 2008-02-22 03:08:26 +00:00
parent b81baa3e9a
commit 59ea75d88e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
upstart-jobs/httpd.nix
View File

@ -23,7 +23,7 @@ let
webServer = import ../../services/apache-httpd { webServer = import ../../services/apache-httpd {
inherit (pkgs) apacheHttpd coreutils; inherit (pkgs) apacheHttpd coreutils;
stdenv = pkgs.stdenvNewSetupScript; stdenv = pkgs.stdenv;
php = if cfg.mod_php then pkgs.php else null; php = if cfg.mod_php then pkgs.php else null;
tomcat_connectors = if cfg.mod_jk.enable then pkgs.tomcat_connectors else null; tomcat_connectors = if cfg.mod_jk.enable then pkgs.tomcat_connectors else null;

2
upstart-jobs/ircd-hybrid.nix
View File

@ -2,7 +2,7 @@
let let
cfg = config.services.ircdHybrid; cfg = config.services.ircdHybrid;
ircdService = import ../services/ircd-hybrid { ircdService = import ../services/ircd-hybrid {
stdenv = pkgs.stdenvNewSetupScript; stdenv = pkgs.stdenv;
inherit (pkgs) ircdHybrid coreutils inherit (pkgs) ircdHybrid coreutils
su iproute gnugrep procps; su iproute gnugrep procps;
serverName = cfg.serverName; serverName = cfg.serverName;

2
upstart-jobs/xserver.nix
View File

@ -12,7 +12,7 @@ let
cfg = config.services.xserver; cfg = config.services.xserver;
xorg = pkgs.xorg; xorg = pkgs.xorg;
gnome = pkgs.gnome; gnome = pkgs.gnome;
stdenv = pkgs.stdenvNewSetupScript; stdenv = pkgs.stdenv;
# Get a bunch of user settings. # Get a bunch of user settings.
videoDriver = cfg.videoDriver; videoDriver = cfg.videoDriver;