public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32302 from andir/uwimap-pollution

Browse Source 
uwimap pollution of `include/`
This commit is contained in:
Jörg Thalheim 2017-12-29 00:08:26 +01:00 committed by GitHub
commit c333e9b348
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/build-pecl.nix
View File

@ -22,6 +22,4 @@ stdenv.mkDerivation (args // {
makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags; makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags;
autoreconfPhase = "phpize"; autoreconfPhase = "phpize";
preConfigure = "touch unix.h";
}) })

1
pkgs/servers/prayer/default.nix
View File

@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
${ssl} \ ${ssl} \
-e 's/CCLIENT_LIBS=.*/CCLIENT_LIBS=-lc-client/' \ -e 's/CCLIENT_LIBS=.*/CCLIENT_LIBS=-lc-client/' \
-e 's,^PREFIX .*,PREFIX='$out, \ -e 's,^PREFIX .*,PREFIX='$out, \
-e 's,^CCLIENT_DIR=.*,CCLIENT_DIR=${uwimap}/include/c-client,' \
Config Config
sed -i -e s,/usr/bin/perl,${perl}/bin/perl, \ sed -i -e s,/usr/bin/perl,${perl}/bin/perl, \
templates/src/*.pl templates/src/*.pl

1
pkgs/servers/uwsgi/default.nix
View File

@ -33,7 +33,6 @@ let pythonPlugin = pkg : lib.nameValuePair "python${if pkg ? isPy2 then "2" else
(lib.nameValuePair "php" { (lib.nameValuePair "php" {
# usage: https://uwsgi-docs.readthedocs.io/en/latest/PHP.html#running-php-apps-with-nginx # usage: https://uwsgi-docs.readthedocs.io/en/latest/PHP.html#running-php-apps-with-nginx
path = "plugins/php"; path = "plugins/php";
preBuild = "touch unix.h";
inputs = [ php-embed ] ++ php-embed.buildInputs; inputs = [ php-embed ] ++ php-embed.buildInputs;
}) })
]; ];

4
pkgs/tools/networking/uwimap/default.nix
View File

@ -29,8 +29,8 @@ stdenv.mkDerivation {
"-I${openssl.dev}/include/openssl"; "-I${openssl.dev}/include/openssl";
installPhase = '' installPhase = ''
mkdir -p $out/bin $out/lib $out/include mkdir -p $out/bin $out/lib $out/include/c-client
cp c-client/*.h c-client/linkage.c $out/include cp c-client/*.h osdep/unix/*.h c-client/linkage.c c-client/auths.c $out/include/c-client/
cp c-client/c-client.a $out/lib/libc-client.a cp c-client/c-client.a $out/lib/libc-client.a
cp mailutil/mailutil imapd/imapd dmail/dmail mlock/mlock mtest/mtest tmail/tmail \ cp mailutil/mailutil imapd/imapd dmail/dmail mlock/mlock mtest/mtest tmail/tmail \
tools/{an,ua} $out/bin tools/{an,ua} $out/bin