From 1e3211afee9f18f0bb49c127d0a7b285fb06fc77 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Tue, 3 Nov 2020 15:56:54 -0300 Subject: Finish packaging mdpo --- nix/nixpkgs-next.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'nix') diff --git a/nix/nixpkgs-next.nix b/nix/nixpkgs-next.nix index 738d19c..1b49383 100644 --- a/nix/nixpkgs-next.nix +++ b/nix/nixpkgs-next.nix @@ -9,7 +9,6 @@ sha256 = "0km84rmcrczq4n87ryf3ffkfbjh4jim361pbld0z8wgp60rz08dh"; }; nativeBuildInputs = with pkgs; [ cmake ]; - outputs = [ "bin" "dev" "out" ]; }; pymd4c = with pkgs.python3.pkgs; @@ -20,16 +19,14 @@ inherit pname version; sha256 = "07s3arn85ri92im6x3ipljdmrxmpik7irs06i6lm17j1x6j9841d"; }; - nativeBuildInputs = with pkgs; [ # cmake - md4c.dev - cython - pkgconfig - setuptools_scm - ]; - propagatedBuildInputs = with pkgs.python3Packages; [ flake8 ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; + propagatedBuildInputs = + [ md4c pkgs.python3Packages.cffi pkgs.python3Packages.pkgconfig ]; - LDFLAGS = "-L${md4c.dev}/lib"; - CFLAGS = "-I${md4c.dev}/include"; + preConfigure = '' + export INCLUDE_DIR=${md4c}/include + export LIB_DIR=${md4c}/lib + ''; }; mdpo = with pkgs.python3.pkgs; -- cgit v1.2.3