From b336be90cc3e7e15140aa1dbc1a98c8a18323506 Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Tue, 18 Oct 2016 18:01:49 +0200 Subject: [PATCH 1/2] php: fix darwin build --- pkgs/development/interpreters/php/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 5bed153dcf82..c4493fa380da 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -19,7 +19,8 @@ let enableParallelBuilding = true; - buildInputs = [ flex bison pkgconfig systemd ]; + buildInputs = [ flex bison pkgconfig ] + ++ lib.optional stdenv.isLinux [systemd ]; configureFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" From 61ce4045985d678977182b2b331d8bcb781c52e8 Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Wed, 19 Oct 2016 09:35:06 +0200 Subject: [PATCH 2/2] php: fix pr review comments --- pkgs/development/interpreters/php/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index c4493fa380da..96c85704f5ef 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -20,7 +20,7 @@ let enableParallelBuilding = true; buildInputs = [ flex bison pkgconfig ] - ++ lib.optional stdenv.isLinux [systemd ]; + ++ lib.optional stdenv.isLinux systemd; configureFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions"