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

Some updates. Now I can build system at least with some settings.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10551
This commit is contained in:
Michael Raskin 2008-02-08 10:39:20 +00:00
parent 58d6720165
commit c264b316b1
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/dbus/default.nix
View File

@ -35,4 +35,8 @@ in rec {
# I'm too lazy to separate daemon and libs now. # I'm too lazy to separate daemon and libs now.
daemon = libs; daemon = libs;
# FIXME TODO
# After merger it will be better to correct upstart-job instead.
outPath = daemon.outPath;
} }

2
pkgs/top-level/all-packages.nix
View File

@ -1347,7 +1347,7 @@ rec {
php = (import ../development/interpreters/php_configurable) { php = (import ../development/interpreters/php_configurable) {
inherit mkDerivationByConfiguration stdenv mysql lib; inherit mkDerivationByConfiguration stdenv mysql lib;
inherit fetchurl flex bison apacheHttpd; # gettext; inherit fetchurl flex bison apacheHttpd; # gettext;
inherit libxml2; inherit libxml2 automake autoconf postgresql;
flags = [ "xdebug" "mysql" "mysqli" "pdo_mysql" "libxml2" "apxs2" ]; flags = [ "xdebug" "mysql" "mysqli" "pdo_mysql" "libxml2" "apxs2" ];
}; };