diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-06-18 18:30:18 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-06-18 18:30:18 +0000 |
| commit | ef93931efff0323fd13c4270415b578c73b5ef35 (patch) | |
| tree | e5b089306c481ce3237027bfb46c940fed1e2114 /nixpkgs/pkgs/servers/sql/postgresql/default.nix | |
| parent | c5571a126859eb658ffd7340cb580f7d91f12bb6 (diff) | |
| parent | a1dd419c1ffacea87eba066a2bb332e03cb68f66 (diff) | |
| download | nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.gz nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.bz2 nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.lz nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.xz nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.zst nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.zip | |
Merge commit 'a1dd419c1ffacea87eba066a2bb332e03cb68f66'
Diffstat (limited to 'nixpkgs/pkgs/servers/sql/postgresql/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/servers/sql/postgresql/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/servers/sql/postgresql/default.nix b/nixpkgs/pkgs/servers/sql/postgresql/default.nix index d46f0cc6317a..701670187b60 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/default.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/default.nix @@ -38,7 +38,7 @@ let enableParallelBuilding = !stdenv.isDarwin; - makeFlags = [ "world" ]; + buildFlags = [ "world" ]; NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ]; @@ -60,6 +60,7 @@ let (if atLeast "9.6" then ./patches/less-is-more-96.patch else ./patches/less-is-more.patch) (if atLeast "9.6" then ./patches/hardcode-pgxs-path-96.patch else ./patches/hardcode-pgxs-path.patch) ./patches/specify_pkglibdir_at_runtime.patch + ./patches/findstring.patch ] ++ lib.optional stdenv.isLinux ./patches/socketdir-in-run.patch; installTargets = [ "install-world" ]; |