diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-12-29 00:08:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-29 00:08:26 +0100 |
| commit | c333e9b348860cac02accf7dba803c00b3819a85 (patch) | |
| tree | 46d05c6528821dfdbb3372c02d963a4ae1616729 /pkgs/servers | |
| parent | e9886dde9b2d69840ca10fadf444bd3ad2d3d281 (diff) | |
| parent | 92158e871e6e96e5e358d8601b9b58a2981f0b98 (diff) | |
| download | nixlib-c333e9b348860cac02accf7dba803c00b3819a85.tar nixlib-c333e9b348860cac02accf7dba803c00b3819a85.tar.gz nixlib-c333e9b348860cac02accf7dba803c00b3819a85.tar.bz2 nixlib-c333e9b348860cac02accf7dba803c00b3819a85.tar.lz nixlib-c333e9b348860cac02accf7dba803c00b3819a85.tar.xz nixlib-c333e9b348860cac02accf7dba803c00b3819a85.tar.zst nixlib-c333e9b348860cac02accf7dba803c00b3819a85.zip | |
Merge pull request #32302 from andir/uwimap-pollution
uwimap pollution of `include/`
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/prayer/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/servers/uwsgi/default.nix | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix index e4b457d0c17b..7997d0ebcd8b 100644 --- a/pkgs/servers/prayer/default.nix +++ b/pkgs/servers/prayer/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { ${ssl} \ -e 's/CCLIENT_LIBS=.*/CCLIENT_LIBS=-lc-client/' \ -e 's,^PREFIX .*,PREFIX='$out, \ + -e 's,^CCLIENT_DIR=.*,CCLIENT_DIR=${uwimap}/include/c-client,' \ Config sed -i -e s,/usr/bin/perl,${perl}/bin/perl, \ templates/src/*.pl diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index d30129d93d95..921708f2fd3f 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -33,7 +33,6 @@ let pythonPlugin = pkg : lib.nameValuePair "python${if pkg ? isPy2 then "2" else (lib.nameValuePair "php" { # usage: https://uwsgi-docs.readthedocs.io/en/latest/PHP.html#running-php-apps-with-nginx path = "plugins/php"; - preBuild = "touch unix.h"; inputs = [ php-embed ] ++ php-embed.buildInputs; }) ]; |