Merge remote-tracking branch 'origin/master' into hardened-stdenv

pkgs/servers/sql/monetdb/default.nix

@@ -25,15 +25,14 @@ composableDerivation.composableDerivation {} {
     javaSupport = true;
   };
 
-  configurePhase = ":";
-  buildPhase = ":";
-  
+  dontBuild = true;
+
   installPhase = ''
     mkdir $TMP/build
     sh monetdb-install.sh --build=$TMP/build --prefix=$out --enable-sql --enable-xquery
   '';
 
-  meta = { 
+  meta = {
     description = "A open-source database system for high-performance applications in data mining, OLAP, GIS, XML Query, text and multimedia retrieval";
     homepage = http://monetdb.cwi.nl/;
     license = "MonetDB Public License"; # very similar to Mozilla public license (MPL) Version see 1.1 http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html 

pkgs/servers/sql/postgresql/default.nix

@@ -32,12 +32,19 @@ let
     patches =
       [ (if lib.versionAtLeast version "9.4" then ./disable-resolve_symlinks-94.patch else ./disable-resolve_symlinks.patch)
         ./less-is-more.patch
+        ./hardcode-pgxs-path.patch
       ];
 
     installTargets = [ "install-world" ];
 
     LC_ALL = "C";
 
+    postConfigure =
+      ''
+        # Hardcode the path to pgxs so pg_config returns the path in $out
+        substituteInPlace "src/bin/pg_config/pg_config.c" --replace HARDCODED_PGXS_PATH $out/lib
+      '';
+
     postInstall =
       ''
         moveToOutput "lib/pgxs" "$out" # looks strange, but not deleting it

pkgs/servers/sql/postgresql/hardcode-pgxs-path.patch

@@ -0,0 +1,17 @@
+--- a/src/bin/pg_config/pg_config.c
++++ b/src/bin/pg_config/pg_config.c
+@@ -220,11 +220,13 @@ show_sysconfdir(bool all)
+ static void
+ show_pgxs(bool all)
+ {
+-	char		path[MAXPGPATH];
++	char		path[MAXPGPATH] = "HARDCODED_PGXS_PATH";
+ 
+ 	if (all)
+ 		printf("PGXS = ");
++  /* commented out to be able to point to nix $out path
+ 	get_pkglib_path(mypath, path);
++  */
+ 	strlcat(path, "/pgxs/src/makefiles/pgxs.mk", sizeof(path));
+ 	cleanup_path(path);
+ 	printf("%s\n", path);