mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 15:41:48 +00:00
Some updates. Now I can build system at least with some settings.
svn path=/nixpkgs/branches/stdenv-updates/; revision=10551
This commit is contained in:
parent
58d6720165
commit
c264b316b1
@ -35,4 +35,8 @@ in rec {
|
||||
|
||||
# I'm too lazy to separate daemon and libs now.
|
||||
daemon = libs;
|
||||
|
||||
# FIXME TODO
|
||||
# After merger it will be better to correct upstart-job instead.
|
||||
outPath = daemon.outPath;
|
||||
}
|
||||
|
@ -1347,7 +1347,7 @@ rec {
|
||||
php = (import ../development/interpreters/php_configurable) {
|
||||
inherit mkDerivationByConfiguration stdenv mysql lib;
|
||||
inherit fetchurl flex bison apacheHttpd; # gettext;
|
||||
inherit libxml2;
|
||||
inherit libxml2 automake autoconf postgresql;
|
||||
flags = [ "xdebug" "mysql" "mysqli" "pdo_mysql" "libxml2" "apxs2" ];
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user