rPackages.*: move env variables into env for structuredAttrs (#502570) (f1bdd19c) · Commits · nix / nixpkgs

pkgs/development/r-modules/default.nix

+63 −29

Original line number	Diff line number	Diff line
		@@ -1863,7 +1863,9 @@ let
		});

		vegan3d = old.vegan3d.overrideAttrs (attrs: {
		env = (attrs.env or { }) // {
		RGL_USE_NULL = "true";
		};
		});

		# it can happen that the major version of arrow-cpp is ahead of the
		@@ -2187,7 +2189,9 @@ let
		});

		nanonext = old.nanonext.overrideAttrs (attrs: {
		env = (attrs.env or { }) // {
		NIX_LDFLAGS = "-lnng -lmbedtls -lmbedx509 -lmbedcrypto";
		};
		});

		clustermq = old.clustermq.overrideAttrs (attrs: {
		@@ -2195,7 +2199,9 @@ let
		});

		Cairo = old.Cairo.overrideAttrs (attrs: {
		env = (attrs.env or { }) // {
		NIX_LDFLAGS = "-lfontconfig";
		};
		});

		curl = old.curl.overrideAttrs (attrs: {
		@@ -2511,7 +2517,9 @@ let
		});

		RAppArmor = old.RAppArmor.overrideAttrs (attrs: {
		env = (attrs.env or { }) // {
		LIBAPPARMOR_HOME = pkgs.libapparmor;
		};
		});

		# Append cargo path to path variable
		@@ -2526,17 +2534,21 @@ let
		});

		RMySQL = old.RMySQL.overrideAttrs (attrs: {
		env = (attrs.env or { }) // {
		MYSQL_DIR = "${pkgs.libmysqlclient}";
		PKGCONFIG_CFLAGS = "-I${pkgs.libmysqlclient.dev}/include/mysql";
		NIX_CFLAGS_LINK = "-L${pkgs.libmysqlclient}/lib/mysql -lmysqlclient";
		};
		preConfigure = ''
		patchShebangs configure
		'';
		});

		devEMF = old.devEMF.overrideAttrs (attrs: {
		env = (attrs.env or { }) // {
		NIX_CFLAGS_LINK = "-L${pkgs.libxft.out}/lib -lXft";
		NIX_LDFLAGS = "-lX11";
		};
		});

		hdf5r = old.hdf5r.overrideAttrs (attrs: {
		@@ -2544,11 +2556,15 @@ let
		});

		slfm = old.slfm.overrideAttrs (attrs: {
		env = (attrs.env or { }) // {
		PKG_LIBS = "-L${pkgs.blas}/lib -lblas -L${pkgs.lapack}/lib -llapack";
		};
		});

		SamplerCompare = old.SamplerCompare.overrideAttrs (attrs: {
		env = (attrs.env or { }) // {
		PKG_LIBS = "-L${pkgs.blas}/lib -lblas -L${pkgs.lapack}/lib -llapack";
		};
		});

		FLAMES = old.FLAMES.overrideAttrs (attrs: {
		@@ -2559,13 +2575,17 @@ let
		preConfigure = ''
		patchShebangs configure
		'';
		env = (attrs.env or { }) // {
		PKGCONFIG_CFLAGS = "-I${pkgs.openssl.dev}/include";
		PKGCONFIG_LIBS = "-Wl,-rpath,${lib.getLib pkgs.openssl}/lib -L${lib.getLib pkgs.openssl}/lib -lssl -lcrypto";
		};
		});

		websocket = old.websocket.overrideAttrs (attrs: {
		env = (attrs.env or { }) // {
		PKGCONFIG_CFLAGS = "-I${pkgs.openssl.dev}/include";
		PKGCONFIG_LIBS = "-Wl,-rpath,${lib.getLib pkgs.openssl}/lib -L${lib.getLib pkgs.openssl}/lib -lssl -lcrypto";
		};
		});

		Rserve = old.Rserve.overrideAttrs (attrs: {
		@@ -2596,11 +2616,13 @@ let
		patchShebangs configure
		'';

		env = (attrs.env or { }) // {
		R_MAKEVARS_SITE = lib.optionalString (pkgs.stdenv.system == "aarch64-linux") (
		pkgs.writeText "Makevars" ''
		CXX14PICFLAGS = -fPIC
		''
		);
		};
		});

		acs = old.acs.overrideAttrs (attrs: {
		@@ -2613,7 +2635,9 @@ let
		preConfigure = ''
		patchShebangs configure
		'';
		env = (attrs.env or { }) // {
		NIX_LDFLAGS = "-lfontconfig -lfreetype";
		};
		});

		magick = old.magick.overrideAttrs (attrs: {
		@@ -2642,7 +2666,9 @@ let
		preConfigure = ''
		export TCLLIBPATH="${pkgs.tclPackages.bwidget}/lib/bwidget${pkgs.tclPackages.bwidget.version}"
		'';
		env = (attrs.env or { }) // {
		TCLLIBPATH = "${pkgs.tclPackages.bwidget}/lib/bwidget${pkgs.tclPackages.bwidget.version}";
		};
		});

		networkscaleup = old.networkscaleup.overrideAttrs (attrs: {
		@@ -2856,8 +2882,10 @@ let
		preConfigure = ''
		patchShebangs configure
		'';
		env = (attrs.env or { }) // {
		PKGCONFIG_CFLAGS = "-I${pkgs.openssl.dev}/include -I${pkgs.cyrus_sasl.dev}/include -I${pkgs.zlib.dev}/include";
		PKGCONFIG_LIBS = "-Wl,-rpath,${lib.getLib pkgs.openssl}/lib -L${lib.getLib pkgs.openssl}/lib -L${pkgs.cyrus_sasl.out}/lib -L${pkgs.zlib.out}/lib -lssl -lcrypto -lsasl2 -lz";
		};
		});

		ChemmineOB = old.ChemmineOB.overrideAttrs (attrs: {
		@@ -3021,7 +3049,9 @@ let
		ChIPXpress = old.ChIPXpress.override { hydraPlatforms = [ ]; };

		rgl = old.rgl.overrideAttrs (attrs: {
		env = (attrs.env or { }) // {
		RGL_USE_NULL = "true";
		};
		});

		Rrdrand = old.Rrdrand.override { platforms = lib.platforms.x86_64 ++ lib.platforms.x86; };
		@@ -3053,7 +3083,9 @@ let
		dbarts = old.dbarts.override { platforms = lib.platforms.x86_64 ++ lib.platforms.x86; };

		geomorph = old.geomorph.overrideAttrs (attrs: {
		env = (attrs.env or { }) // {
		RGL_USE_NULL = "true";
		};
		});

		gpuMagic = old.gpuMagic.overrideAttrs (_: {
		@@ -3107,9 +3139,11 @@ let
		postPatch = "patchShebangs configure";
		});

		redland = old.redland.overrideAttrs (_: {
		redland = old.redland.overrideAttrs (attrs: {
		env = (attrs.env or { }) // {
		PKGCONFIG_CFLAGS = "-I${pkgs.redland}/include -I${pkgs.librdf_raptor2}/include/raptor2 -I${pkgs.librdf_rasqal}/include/rasqal";
		PKGCONFIG_LIBS = "-L${pkgs.redland}/lib -L${pkgs.librdf_raptor2}/lib -L${pkgs.librdf_rasqal}/lib -lrdf -lraptor2 -lrasqal";
		};
		});

		textshaping = old.textshaping.overrideAttrs (attrs: {