mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-29 17:14:33 +00:00
571c71e6f7
We are migrating packages that meet below requirements:
1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration
The tool is here: https://github.com/Aleksanaa/by-name-migrate.
14 lines
584 B
Diff
14 lines
584 B
Diff
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
|