parsav  Diff

Differences From Artifact [dbac8681c6]:

• File pkgdata.lua — part of check-in [afae276b2f] at 2021-01-29 21:14:57 on branch trunk — rip out json-c, replace with mjson (user: lexi, size: 1029) [annotate] [blame] [check-ins using]

To Artifact [0f9c69d77b]:

• File pkgdata.lua — part of check-in [8648683aba] at 2022-11-04 04:27:15 on branch trunk — fixes to make parsav build on modern nix (user: lexi, size: 1256) [annotate] [blame] [check-ins using]

     2      2   local sthunk = function(...) local a = {...} return function() return util.exec(a) end end
     3      3   
     4      4   return {
     5      5   	mbedtls = { 
     6      6   		libs = {'mbedtls', 'mbedcrypto', 'mbedx509'};
     7      7   		osvars = {
     8      8   			linux_nixos = { -- lacks a *.pc on nixos systems
     9         -				prefix = sthunk('nix', 'path-info', 'nixos.mbedtls');
            9  +				-- prefix = sthunk('nix', 'path-info', 'nixos.mbedtls');
           10  +				prefix = os.getenv("parsav_pkg_mbedtls_prefix");
    10     11   			}
    11     12   		};
    12     13   		vars = { builddir = '/library', srcincdir = '/include' };
    13     14   	};
    14     15   	mongoose = { vars = { builddir = '' } };
    15     16   	mjson = { vars = { builddir = '', srcincdir = '/src' } };
    16     17   	libpq = {
    17     18   		osvars = {
    18     19   			linux_nixos = {
    19         -				prefix = sthunk('nix', 'path-info', 'nixos.postgresql.lib');
    20         -				incdir = function()
    21         -					local a = {'nix', 'path-info', 'nixos.postgresql'}
    22         -					return (util.exec(a)) .. '/include';
    23         -				end;
           20  +				prefix = os.getenv("parsav_pkg_libpq_libdir");
           21  +				incdir = os.getenv("parsav_pkg_libpq_incdir");
           22  +				-- prefix = sthunk('nix', 'path-info', 'nixos.postgresql.lib');
           23  +				-- incdir = function()
           24  +				-- 	local a = {'nix', 'path-info', 'nixos.postgresql'}
           25  +				-- 	return (util.exec(a)) .. '/include';
           26  +				-- end;
    24     27   			};
    25     28   		};
    26     29   		vars = {pcname = 'postgresql';}
    27     30   	};
    28     31   	libc = {
    29     32   		libs = {'c'}; -- libc.so probably does not need explicit mention, but
    30     33   		osvars = {
    31     34   			linux = { override = 'glibc'; };
    32     35   			linux_nixos = {
    33         -				prefix = sthunk('nix', 'path-info', 'nixos.glibc');
           36  +				prefix = os.getenv("parsav_pkg_glibc_prefix");
           37  +				-- prefix = sthunk('nix', 'path-info', 'nixos.glibc');
    34     38   				override = 'glibc';
    35     39   			};
    36     40   		}
    37     41   	};
    38     42   }