fwupd: 2.0.5 -> 2.0.6 (#382047) (102c03f2) · Commits · nix / nixpkgs

pkgs/by-name/fw/fwupd/package.nix

+117 −90

Original line number	Diff line number	Diff line
		# Updating? Keep $out/etc synchronized with passthru keys

		{
		pkgsBuildBuild,
		stdenv,
		lib,
		stdenv,

		# runPythonCommand
		runCommand,
		python3,

		# test-firmware
		fetchFromGitHub,
		gi-docgen,
		unstableGitUpdater,

		# fwupd
		pkg-config,
		gobject-introspection,
		pkgsBuildBuild,

		# propagatedBuildInputs
		json-glib,

		# nativeBuildInputs
		ensureNewerSourcesForZipFilesHook,
		gettext,
		libgudev,
		libdrm,
		polkit,
		libxmlb,
		gusb,
		sqlite,
		libarchive,
		libredirect,
		curl,
		libjcat,
		elfutils,
		valgrind,
		gi-docgen,
		gobject-introspection,
		meson,
		mesonEmulatorHook,
		libuuid,
		ninja,
		gnutls,
		protobufc,
		python3,
		wrapGAppsNoGuiHook,
		ensureNewerSourcesForZipFilesHook,
		json-glib,
		bash-completion,
		shared-mime-info,
		vala,
		makeFontsConf,
		freefont_ttf,
		wrapGAppsNoGuiHook,
		writableTmpDirAsHomeHook,
		mesonEmulatorHook,

		# buildInputs
		bash-completion,
		curl,
		elfutils,
		fwupd-efi,
		gnutls,
		gusb,
		libarchive,
		libcbor,
		libdrm,
		libgudev,
		libjcat,
		libmbim,
		libqmi,
		libuuid,
		libxmlb,
		modemmanager,
		pango,
		polkit,
		sqlite,
		tpm2-tss,
		valgrind,
		xz, # for liblzma
		flashrom,

		# mesonFlags
		hwdata,

		# env
		makeFontsConf,
		freefont_ttf,

		# preCheck
		libredirect,

		# preFixup
		bubblewrap,
		efibootmgr,
		flashrom,
		tpm2-tools,
		fwupd-efi,

		# passthru
		nixosTests,
		runCommand,
		unstableGitUpdater,
		modemmanager,
		libqmi,
		libmbim,
		libcbor,
		xz,
		hwdata,
		nix-update-script,

		enableFlashrom ? false,
		enablePassim ? false,
		}:
		@@ -117,7 +141,7 @@ let
		in
		stdenv.mkDerivation (finalAttrs: {
		pname = "fwupd";
		version = "2.0.5";
		version = "2.0.6";

		# libfwupd goes to lib
		# daemon, plug-ins and libfwupdplugin go to out
		@@ -135,7 +159,7 @@ stdenv.mkDerivation (finalAttrs: {
		owner = "fwupd";
		repo = "fwupd";
		tag = finalAttrs.version;
		hash = "sha256-V07alPn2+bOkKx+oh8qoX4Ie6/5ujO6h/TDzvL3UhvQ=";
		hash = "sha256-//y2kkCrj6E3kKxZIEK2bBUiZezB9j4xzR6WrBdcpqQ=";
		};

		patches = [
		@@ -158,6 +182,19 @@ stdenv.mkDerivation (finalAttrs: {
		./efi-app-path.patch
		];

		postPatch =
		''
		patchShebangs \
		contrib/generate-version-script.py \
		contrib/generate-man.py \
		po/test-deps
		''
		# in nixos test tries to chmod 0777 $out/share/installed-tests/fwupd/tests/redfish.conf
		+ ''
		substituteInPlace plugins/redfish/meson.build \
		--replace-fail "get_option('tests')" "false"
		'';

		strictDeps = true;

		depsBuildBuild = [
		@@ -172,16 +209,19 @@ stdenv.mkDerivation (finalAttrs: {
		nativeBuildInputs =
		[
		ensureNewerSourcesForZipFilesHook # required for firmware zipping
		gettext
		gi-docgen
		gobject-introspection
		meson
		ninja
		pkg-config
		gettext
		shared-mime-info
		protobufc # for protoc
		wrapGAppsNoGuiHook
		shared-mime-info
		vala
		gobject-introspection
		gi-docgen
		wrapGAppsNoGuiHook

		# jcat-tool at buildtime requires a home directory
		writableTmpDirAsHomeHook
		]
		++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
		mesonEmulatorHook
		@@ -189,29 +229,29 @@ stdenv.mkDerivation (finalAttrs: {

		buildInputs =
		[
		bash-completion
		curl
		elfutils
		fwupd-efi
		gnutls
		polkit
		libxmlb
		gusb
		sqlite
		libarchive
		libcbor
		libdrm
		curl
		elfutils
		libgudev
		libjcat
		libmbim
		libqmi
		libuuid
		bash-completion
		libxmlb
		modemmanager
		pango
		tpm2-tss
		fwupd-efi
		polkit
		protobufc
		modemmanager
		libmbim
		libcbor
		libqmi
		xz # for liblzma
		sqlite
		tpm2-tss
		valgrind
		xz # for liblzma
		]
		++ lib.optionals haveFlashrom [
		flashrom
		@@ -219,39 +259,39 @@ stdenv.mkDerivation (finalAttrs: {

		mesonFlags =
		[
		"-Ddocs=enabled"
		(lib.mesonEnable "docs" true)
		# We are building the official releases.
		"-Dsupported_build=enabled"
		"-Dlaunchd=disabled"
		"-Dsystemd_root_prefix=${placeholder "out"}"
		"-Dinstalled_test_prefix=${placeholder "installedTests"}"
		(lib.mesonEnable "supported_build" true)
		(lib.mesonEnable "launchd" false)
		(lib.mesonOption "systemd_root_prefix" "${placeholder "out"}")
		(lib.mesonOption "installed_test_prefix" "${placeholder "installedTests"}")
		"--localstatedir=/var"
		"--sysconfdir=/etc"
		"-Dsysconfdir_install=${placeholder "out"}/etc"
		"-Defi_os_dir=nixos"
		"-Dplugin_modem_manager=enabled"
		"-Dvendor_metadata=true"
		"-Dplugin_uefi_capsule_splash=false"
		(lib.mesonOption "sysconfdir_install" "${placeholder "out"}/etc")
		(lib.mesonOption "efi_os_dir" "nixos")
		(lib.mesonEnable "plugin_modem_manager" true)
		(lib.mesonBool "vendor_metadata" true)
		(lib.mesonBool "plugin_uefi_capsule_splash" false)
		# TODO: what should this be?
		"-Dvendor_ids_dir=${hwdata}/share/hwdata"
		"-Dumockdev_tests=disabled"
		(lib.mesonOption "vendor_ids_dir" "${hwdata}/share/hwdata")
		(lib.mesonEnable "umockdev_tests" false)
		# We do not want to place the daemon into lib (cyclic reference)
		"--libexecdir=${placeholder "out"}/libexec"
		]
		++ lib.optionals (!enablePassim) [
		"-Dpassim=disabled"
		(lib.mesonEnable "passim" false)
		]
		++ lib.optionals (!haveDell) [
		"-Dplugin_synaptics_mst=disabled"
		(lib.mesonEnable "plugin_synaptics_mst" false)
		]
		++ lib.optionals (!haveRedfish) [
		"-Dplugin_redfish=disabled"
		(lib.mesonEnable "plugin_redfish" false)
		]
		++ lib.optionals (!haveFlashrom) [
		"-Dplugin_flashrom=disabled"
		(lib.mesonEnable "plugin_flashrom" false)
		]
		++ lib.optionals (!haveMSR) [
		"-Dplugin_msr=disabled"
		(lib.mesonEnable "plugin_msr" false)
		];

		# TODO: wrapGAppsHook3 wraps efi capsule even though it is not ELF
		@@ -275,22 +315,9 @@ stdenv.mkDerivation (finalAttrs: {
		PKG_CONFIG_POLKIT_GOBJECT_1_ACTIONDIR = "/run/current-system/sw/share/polkit-1/actions";
		};

		# Phase hooks

		postPatch = ''
		patchShebangs \
		contrib/generate-version-script.py \
		contrib/generate-man.py \
		po/test-deps

		# in nixos test tries to chmod 0777 $out/share/installed-tests/fwupd/tests/redfish.conf
		sed -i "s/get_option('tests')/false/" plugins/redfish/meson.build
		'';

		preBuild = ''
		# jcat-tool at buildtime requires a home directory
		export HOME="$(mktemp -d)"
		'';
		nativeCheckInputs = [
		polkit
		];

		preCheck = ''
		addToSearchPath XDG_DATA_DIRS "${shared-mime-info}/share"
		@@ -308,8 +335,8 @@ stdenv.mkDerivation (finalAttrs: {
		preFixup =
		let
		binPath = [
		efibootmgr
		bubblewrap
		efibootmgr
		tpm2-tools
		];
		in

Admin message