parsav  Diff

Differences From Artifact [69636ff762]:

• File default.nix — part of check-in [df4ae251ef] at 2020-12-16 08:46:15 on branch trunk — add nix build file (user: lexi, size: 1194) [annotate] [blame] [check-ins using]

To Artifact [e620433c36]:

• File default.nix — 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: 1727) [annotate] [blame] [check-ins using]

     1      1   let pkg = import <nixpkgs> {};
     2      2   in {stdenv          ? pkg.stdenv,
     3      3   	fetchFromGitHub ? pkg.fetchFromGitHub,
     4         -	terra           ? pkg.terra-modern,
            4  +	terra           ? pkg.terra,
     5      5   	pkgconfig       ? pkg.pkgconfig,
     6      6   	json_c          ? pkg.json_c,
     7      7   	postgresql      ? pkg.postgresql.lib,
     8      8   	mbedtls         ? pkg.mbedtls,
     9         -	mongoose        ? null
            9  +	glibc           ? pkg.glibc,
           10  +	cmark           ? pkg.cmark,
           11  +	inkscape        ? pkg.inkscape,
           12  +	mongoose        ? null,
           13  +	lib             ? pkg.lib
    10     14   }:
    11     15   let mgsrc = if mongoose != null then mongoose
    12     16   			else fetchFromGitHub {
    13     17   				owner = "cesanta";
    14     18   				repo = "mongoose";
    15     19   				rev = "369f44adfa38e0d8fa9667e9d6bafd7e0e3c6231";
    16     20   				sha256 = "17rkd7ydic39cw9sfh11mcil02vmi6jjyj2ncbxan6psak09xbrc";
................................................................................
    17     21   			};
    18     22   	pkv = val: p: "parsav_pkg_${p}_${val}";
    19     23   	pkp = pkv "prefix";
    20     24   in stdenv.mkDerivation {
    21     25   	name = "parsav";
    22     26   	version = "dev";
    23     27   	nativeBuildInputs = [terra json_c pkgconfig mbedtls];
           28  +	buildInputs = [cmark inkscape postgresql postgresql.lib];
    24     29   	src = ./.;
    25     30   
    26     31   	${pkp "json-c"} = "${json_c}";
    27         -	${pkp "libpq"} = "${postgresql}";
    28     32   	${pkp "mbedtls"} = "${mbedtls}";
           33  +	${pkp "libc"} = "${glibc.out}";
           34  +	${pkp "cmark"} = "${cmark}";
           35  +	${pkp "inkscape"} = "${inkscape}";
           36  +	${pkv "incdir" "libpq"} = "${postgresql.out}/include";
           37  +	${pkv "libdir" "libpq"} = "${postgresql.lib}/lib";
           38  +
           39  +	parsav_build_branch = "trunk";
           40  +	parsav_build_checkout = "<latest>";
           41  +	parsav_builder = "nixpkgs";
           42  +
           43  +	parsav_install_prefix_cfg="/etc/parsav";
           44  +	preBuild = ''
           45  +		export parsav_install_prefix="$out"
           46  +	'';
    29     47   
    30     48   	parsav_target_os = "linux";
    31     49   	parsav_dist = "nixos";
    32     50   	configurePhase = ''
    33     51   		cp -r ${mgsrc} lib/mongoose
    34     52   	'';
    35         -	installPhase = ''
    36         -		make prefix=$prefix install
    37         -	'';
           53  +	# postInstall = ''
           54  +	# 	make prefix=$out install
           55  +	# '';
    38     56   	
    39     57   	meta = {
    40     58   		description = "lightweight fediverse server";
    41     59   		homepage = https://c.hale.su/parsav;
    42         -		license = stdenv.lib.licenses.agpl3;
    43         -		platforms = stdenv.lib.platforms.unix;
           60  +		license = lib.licenses.agpl3;
           61  +		platforms = lib.platforms.unix;
    44     62   	};
    45     63   }