diff options
author | Robin Gloster <mail@glob.in> | 2019-11-05 02:10:31 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-30 13:22:43 +0100 |
commit | 2157dcd141a5df499698ffb9b1d901192f089bdc (patch) | |
tree | aff6dd99868e7b461d5b5f87f347c079960862ed /pkgs/servers | |
parent | 133103d7094c148bdc9152562b16c8872c44f345 (diff) |
treewide: installFlags is a list
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/amqp/rabbitmq-server/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/http/apache-modules/mod_python/default.nix | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index a25bf48f8ddee..f1838f2a2cba5 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "doc" ]; - installFlags = "PREFIX=$(out) RMQ_ERLAPP_DIR=$(out)"; - installTargets = "install install-man"; + installFlags = [ "PREFIX=$(out)" "RMQ_ERLAPP_DIR=$(out)" ]; + installTargets = [ "install" "install-man" ]; runtimePath = stdenv.lib.makeBinPath [getconf erlang socat]; postInstall = '' diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix index f947bf535cc91..6aed1481ddf35 100644 --- a/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -16,8 +16,9 @@ stdenv.mkDerivation rec { --replace '-$GIT' "" ''; + installFlags = [ "LIBEXECDIR=${placeholder "out"}/modules" ]; + preInstall = '' - installFlags="LIBEXECDIR=$out/modules $installFlags" mkdir -p $out/modules $out/bin ''; |