Merge pull request #216096 from obsidiansystems/more-meta-pkg-config-modules (93efb3bb) · Commits · nix / nixpkgs

pkgs/applications/science/math/R/default.nix

+9 −3

Original line number	Diff line number	Diff line
		@@ -8,15 +8,18 @@
		# R as of writing does not support outputting both .so and .a files; it outputs:
		# --enable-R-static-lib conflicts with --enable-R-shlib and will be ignored
		, static ? false
		, testers
		}:

		assert (!blas.isILP64) && (!lapack.isILP64);

		stdenv.mkDerivation rec {
		stdenv.mkDerivation (finalAttrs: {
		pname = "R";
		version = "4.2.2";

		src = fetchurl {
		src = let
		inherit (finalAttrs) pname version;
		in fetchurl {
		url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz";
		sha256 = "sha256-D/YrQuxRr6VxPK7nxP3noMRZQLo5vvjFyUh/7wyVPfU=";
		};
		@@ -97,6 +100,8 @@ stdenv.mkDerivation rec {

		setupHook = ./setup-hook.sh;

		passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

		meta = with lib; {
		homepage = "http://www.r-project.org/";
		description = "Free software environment for statistical computing and graphics";
		@@ -121,8 +126,9 @@ stdenv.mkDerivation rec {
		user-defined recursive functions and input and output facilities.
		'';

		pkgConfigModules = [ "libR" ];
		platforms = platforms.all;

		maintainers = with maintainers; [ jbedo ] ++ teams.sage.members;
		};
		}
		})

pkgs/development/libraries/ffmpeg/generic.nix

+11 −4

Original line number	Diff line number	Diff line
		@@ -266,6 +266,10 @@
		, MediaToolbox
		, VideoDecodeAcceleration
		, VideoToolbox
		/*
		* Testing
		*/
		, testers
		}:

		/* Maintainer notes:
		@@ -321,13 +325,13 @@ assert buildAvformat -> buildAvcodec && buildAvutil; # configure flag since 0.6
		assert buildPostproc -> buildAvutil;
		assert buildSwscale -> buildAvutil;

		stdenv.mkDerivation rec {
		stdenv.mkDerivation (finalAttrs: {
		pname = "ffmpeg" + (if ffmpegVariant == "small" then "" else "-${ffmpegVariant}");
		inherit version;

		src = fetchgit {
		url = "https://git.ffmpeg.org/ffmpeg.git";
		rev = "n${version}";
		rev = "n${finalAttrs.version}";
		inherit sha256;
		};

		@@ -522,7 +526,7 @@ stdenv.mkDerivation rec {
		# outputs where we don't want them. Patch the generated config.h to remove all
		# such references except for data.
		postConfigure = let
		toStrip = lib.remove "data" outputs; # We want to keep references to the data dir.
		toStrip = lib.remove "data" finalAttrs.outputs; # We want to keep references to the data dir.
		in
		"remove-references-to ${lib.concatStringsSep " " (map (o: "-t ${placeholder o}") toStrip)} config.h";

		@@ -656,6 +660,8 @@ stdenv.mkDerivation rec {

		enableParallelBuilding = true;

		passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

		meta = with lib; {
		description = "A complete, cross-platform solution to record, convert and stream audio and video";
		homepage = "https://www.ffmpeg.org/";
		@@ -671,7 +677,8 @@ stdenv.mkDerivation rec {
		++ optional withGPL gpl2Plus
		++ optional withGPLv3 gpl3Plus
		++ optional withUnfree unfreeRedistributable;
		pkgConfigModules = [ "libavutil" ];
		platforms = platforms.all;
		maintainers = with maintainers; [ atemu ];
		};
		}
		})

pkgs/development/libraries/hidapi/default.nix

+12 −3

Original line number	Diff line number	Diff line
		@@ -7,16 +7,17 @@
		, udev
		, Cocoa
		, IOKit
		, testers
		}:

		stdenv.mkDerivation rec {
		stdenv.mkDerivation (finalAttrs: {
		pname = "hidapi";
		version = "0.12.0";

		src = fetchFromGitHub {
		owner = "libusb";
		repo = "hidapi";
		rev = "${pname}-${version}";
		rev = "${finalAttrs.pname}-${finalAttrs.version}";
		sha256 = "sha256-SMhlcB7LcViC6UFVYACjunxsGkvSOKC3mbLBH4XQSzM=";
		};

		@@ -28,12 +29,20 @@ stdenv.mkDerivation rec {

		propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Cocoa IOKit ];

		passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

		meta = with lib; {
		description = "Library for communicating with USB and Bluetooth HID devices";
		homepage = "https://github.com/libusb/hidapi";
		maintainers = with maintainers; [ prusnak ];
		# You can choose between GPLv3, BSD or HIDAPI license (even more liberal)
		license = with licenses; [ bsd3 /* or */ gpl3Only ] ;
		pkgConfigModules = lib.optionals stdenv.isDarwin [
		"hidapi"
		] ++ lib.optionals stdenv.isLinux [
		"hidapi-hidraw"
		"hidapi-libusb"
		];
		platforms = platforms.unix;
		};
		}
		})

pkgs/development/libraries/icu/63.nix

+4 −2

Original line number	Diff line number	Diff line
		{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, nativeBuildRoot, buildRootOnly ? false }:
		{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, nativeBuildRoot, testers
		, buildRootOnly ? false
		}:

		import ./base.nix {
		version = "63.1";
		@@ -11,4 +13,4 @@ import ./base.nix {
		})
		];
		patchFlags = [ "-p3" ];
		} { inherit stdenv lib fetchurl fixDarwinDylibNames nativeBuildRoot buildRootOnly; }
		} { inherit stdenv lib fetchurl fixDarwinDylibNames nativeBuildRoot testers buildRootOnly; }

pkgs/development/libraries/icu/base.nix

+9 −1

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@
		{ stdenv, lib, fetchurl, fixDarwinDylibNames
		# Cross-compiled icu4c requires a build-root of a native compile
		, buildRootOnly ? false, nativeBuildRoot
		, testers
		}:

		let
		@@ -45,6 +46,11 @@ let
		description = "Unicode and globalization support library";
		homepage = "https://icu.unicode.org/";
		maintainers = with maintainers; [ raskin ];
		pkgConfigModules = [
		"icu-i18n"
		"icu-io"
		"icu-uc"
		];
		platforms = platforms.all;
		};
		};
		@@ -97,4 +103,6 @@ let
		then buildRootOnlyAttrs
		else realAttrs;
		in
		stdenv.mkDerivation attrs
		stdenv.mkDerivation (finalAttrs: attrs // {
		passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
		})

Admin message