Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

php: add a dev ouptut & strip all the binaries #14822

Closed
wants to merge 2 commits into from
Closed

php: add a dev ouptut & strip all the binaries #14822

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7a281e
php: remove reference to build dependencies
layus Apr 16, 2016
5660bbc
php: create a dev ouptut
layus Apr 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions nixos/modules/services/web-servers/apache-httpd/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ let
allModules =
concatMap (svc: svc.extraModulesPre) allSubservices
++ map (name: {inherit name; path = "${httpd}/modules/mod_${name}.so";}) apacheModules
++ optional enablePHP { name = "php5"; path = "${php}/modules/libphp5.so"; }
++ optional enablePHP { name = "php5"; path = "${php.out}/modules/libphp5.so"; }
++ concatMap (svc: svc.extraModules) allSubservices
++ extraForeignModules;
in concatMapStrings load allModules
Expand Down Expand Up @@ -406,7 +406,7 @@ let
([ mainCfg.phpOptions ] ++ (map (svc: svc.phpOptions) allSubservices));
}
''
cat ${php}/etc/php-recommended.ini > $out
cat ${php.out}/etc/php-recommended.ini > $out
echo "$options" >> $out
'';

Expand Down
4 changes: 2 additions & 2 deletions nixos/modules/services/web-servers/phpfpm.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ in {

phpPackage = mkOption {
type = types.package;
default = pkgs.php;
defaultText = "pkgs.php";
default = pkgs.php.out;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of making the user to set e.g. phpPackage = php56.out;, keep this as it is, but instead use ${phpPackage.out} everywhere where phpPackage was used by the module.

defaultText = "pkgs.php.out";
description = ''
The PHP package to use for running the FPM service.
'';
Expand Down
2 changes: 2 additions & 0 deletions pkgs/development/interpreters/php/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,8 @@ let
calendarSupport = config.php.calendar or true;
};

outputs = [ "dev" "out" ];

configurePhase = ''
# Don't record the configure flags since this causes unnecessary
# runtime dependencies.
Expand Down