From 389981f34bee767011e7859cd553ef90533b3c04 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 21 Jun 2016 02:39:55 +0300 Subject: [PATCH] uwsgi: add rack support --- pkgs/servers/uwsgi/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index de3689a80074..3bec62ebe039 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -4,6 +4,7 @@ , pam, withPAM ? false , systemd, withSystemd ? false , python2, python3, ncurses +, ruby }: let pythonPlugin = pkg : lib.nameValuePair "python${if pkg ? isPy2 then "2" else "3"}" { @@ -20,6 +21,10 @@ let pythonPlugin = pkg : lib.nameValuePair "python${if pkg ? isPy2 then "2" else available = lib.listToAttrs [ (pythonPlugin python2) (pythonPlugin python3) + (lib.nameValuePair "rack" { + path = "plugins/rack"; + inputs = [ ruby ]; + }) ]; getPlugin = name: @@ -65,12 +70,12 @@ stdenv.mkDerivation rec { buildPhase = '' mkdir -p $pluginDir python3 uwsgiconfig.py --build nixos - ${lib.concatMapStringsSep ";" (x: "${x.interpreter} uwsgiconfig.py --plugin ${x.path} nixos ${x.name}") needed} + ${lib.concatMapStringsSep ";" (x: "${x.interpreter or "python3"} uwsgiconfig.py --plugin ${x.path} nixos ${x.name}") needed} ''; installPhase = '' install -Dm755 uwsgi $out/bin/uwsgi - ${lib.concatMapStringsSep "\n" (x: x.install) needed} + ${lib.concatMapStringsSep "\n" (x: x.install or "") needed} ''; NIX_CFLAGS_LINK = [ "-lsystemd" ];