parsav  Diff

Differences From Artifact [8c50f1b4b0]:

To Artifact [85c9cc69e8]:


     5      5   	mbedtls = { 
     6      6   		libs = {'mbedtls', 'mbedcrypto', 'mbedx509'};
     7      7   		osvars = {
     8      8   			linux_nixos = { -- lacks a *.pc on nixos systems
     9      9   				prefix = sthunk('nix', 'path-info', 'nixos.mbedtls');
    10     10   			}
    11     11   		};
    12         -		vars = { builddir = '/library' };
           12  +		vars = { builddir = '/library', srcincdir = '/include' };
           13  +	};
           14  +	['json-c'] = {
           15  +		osvars = {
           16  +			linux_nixos = {
           17  +				prefix = sthunk('nix','path-info','nixos.json_c');
           18  +			};
           19  +		};
           20  +		vars = {
           21  +			builddir = '';
           22  +			incsuffix = '/json-c'; -- only used when path generated from prefix
           23  +		}
    13     24   	};
    14     25   	mongoose = { vars = { builddir = '' } };
    15     26   	libpq = {
    16     27   		osvars = {
    17     28   			linux_nixos = {
    18     29   				prefix = sthunk('nix', 'path-info', 'nixos.postgresql.lib');
    19     30   				incdir = function()
................................................................................
    21     32   					return (util.exec(a)) .. '/include';
    22     33   				end;
    23     34   			};
    24     35   		};
    25     36   		vars = {pcname = 'postgresql';}
    26     37   	};
    27     38   	libc = {
    28         -		libs = {'dl'}; -- libc.so does not need explicit mention
           39  +		libs = {'c'}; -- libc.so probably does not need explicit mention, but
    29     40   		osvars = {
           41  +			linux = { override = 'glibc'; };
    30     42   			linux_nixos = {
    31     43   				prefix = sthunk('nix', 'path-info', 'nixos.glibc');
    32     44   				override = 'glibc';
    33     45   			};
    34         -			linux = { override = 'glibc'; };
    35     46   		}
    36     47   	};
    37     48   }