diff options
| author | Дамјан Георгиевски <gdamjan@gmail.com> | 2020-09-09 12:51:40 +0200 |
|---|---|---|
| committer | Дамјан Георгиевски <gdamjan@gmail.com> | 2020-12-22 14:12:15 +0100 |
| commit | 87bed6c86aa9abb434b18d4e5e4aa47133eac666 (patch) | |
| tree | f61b58c448f41c430df976105649b01f7c2869bf | |
| parent | 6dd858dc300d0f185ca916d90d862927c7bd07cb (diff) | |
uwsgi: the php plugin needs to link with session.so
On NixOS the session.so php extension is a separate package (and not builtin
in libphp.so). But since the uwsgi php plugin uses the session
mechanisms, we need to link the plugin to that library too.
With this change uwsgipluginpy is hacked to take an additional UWSGICONFIG_PHP_LDFLAGS
environment variable and add it to its LDFLAGS, and then in the nix
expression the UWSGICONFIG_PHP_LDFLAGS is set to point to php.extensions.session
| -rw-r--r-- | pkgs/servers/uwsgi/additional-php-ldflags.patch | 13 | ||||
| -rw-r--r-- | pkgs/servers/uwsgi/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/servers/uwsgi/no-ext-session-php_session.h-on-NixOS.patch (renamed from pkgs/servers/uwsgi/0001-no-ext-session-php_session.h-on-NixOS.patch) | 0 |
3 files changed, 27 insertions, 1 deletions
diff --git a/pkgs/servers/uwsgi/additional-php-ldflags.patch b/pkgs/servers/uwsgi/additional-php-ldflags.patch new file mode 100644 index 000000000000..8549d5c2d03c --- /dev/null +++ b/pkgs/servers/uwsgi/additional-php-ldflags.patch @@ -0,0 +1,13 @@ +diff --git a/plugins/php/uwsgiplugin.py b/plugins/php/uwsgiplugin.py +index d930c44e..2fcbc22a 100644 +--- a/plugins/php/uwsgiplugin.py ++++ b/plugins/php/uwsgiplugin.py +@@ -17,6 +17,8 @@ php_version = os.popen(PHPPATH + ' --version').read().rstrip().split('.')[0] + CFLAGS = [os.popen(PHPPATH + ' --includes').read().rstrip(), '-Wno-sign-compare'] + LDFLAGS = os.popen(PHPPATH + ' --ldflags').read().rstrip().split() + ++LDFLAGS.append(os.environ.get('UWSGICONFIG_PHP_LDFLAGS', [])) ++ + if ld_run_path: + LDFLAGS.append('-L%s' % ld_run_path) + os.environ['LD_RUN_PATH'] = ld_run_path diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index bb2742ecba8e..17d430a82efd 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -65,7 +65,10 @@ stdenv.mkDerivation rec { sha256 = "0256v72b7zr6ds4srpaawk1px3bp0djdwm239w3wrxpw7dzk1gjn"; }; - patches = [ ./0001-no-ext-session-php_session.h-on-NixOS.patch ]; + patches = [ + ./no-ext-session-php_session.h-on-NixOS.patch + ./additional-php-ldflags.patch + ]; nativeBuildInputs = [ python3 pkgconfig ]; @@ -89,6 +92,16 @@ stdenv.mkDerivation rec { substituteAll ${./nixos.ini} buildconf/nixos.ini ''; + # this is a hack to make the php plugin link with session.so (which on nixos is a separate package) + # the hack works in coordination with ./additional-php-ldflags.patch + UWSGICONFIG_PHP_LDFLAGS = lib.optionalString (builtins.any (x: x.name == "php") needed) + (lib.concatStringsSep "," [ + "-Wl" + "-rpath=${php-embed.extensions.session}/lib/php/extensions/" + "--library-path=${php-embed.extensions.session}/lib/php/extensions/" + "-l:session.so" + ]); + buildPhase = '' mkdir -p $pluginDir python3 uwsgiconfig.py --build nixos diff --git a/pkgs/servers/uwsgi/0001-no-ext-session-php_session.h-on-NixOS.patch b/pkgs/servers/uwsgi/no-ext-session-php_session.h-on-NixOS.patch index bde8f4fda1dc..bde8f4fda1dc 100644 --- a/pkgs/servers/uwsgi/0001-no-ext-session-php_session.h-on-NixOS.patch +++ b/pkgs/servers/uwsgi/no-ext-session-php_session.h-on-NixOS.patch |