mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-13 17:23:08 +00:00
!!! 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...
svn path=/nixos/trunk/; revision=10824
This commit is contained in:
parent
b81baa3e9a
commit
59ea75d88e
@ -23,7 +23,7 @@ let
|
||||
|
||||
webServer = import ../../services/apache-httpd {
|
||||
inherit (pkgs) apacheHttpd coreutils;
|
||||
stdenv = pkgs.stdenvNewSetupScript;
|
||||
stdenv = pkgs.stdenv;
|
||||
php = if cfg.mod_php then pkgs.php else null;
|
||||
tomcat_connectors = if cfg.mod_jk.enable then pkgs.tomcat_connectors else null;
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
let
|
||||
cfg = config.services.ircdHybrid;
|
||||
ircdService = import ../services/ircd-hybrid {
|
||||
stdenv = pkgs.stdenvNewSetupScript;
|
||||
stdenv = pkgs.stdenv;
|
||||
inherit (pkgs) ircdHybrid coreutils
|
||||
su iproute gnugrep procps;
|
||||
serverName = cfg.serverName;
|
||||
|
@ -12,7 +12,7 @@ let
|
||||
cfg = config.services.xserver;
|
||||
xorg = pkgs.xorg;
|
||||
gnome = pkgs.gnome;
|
||||
stdenv = pkgs.stdenvNewSetupScript;
|
||||
stdenv = pkgs.stdenv;
|
||||
|
||||
# Get a bunch of user settings.
|
||||
videoDriver = cfg.videoDriver;
|
||||
|
Loading…
Reference in New Issue
Block a user