Merge pull request #219935 from Emantor/bump/rauc

rauc: update build system to use meson

Sandro d26c1917 1e7ad478

Changed files
+22 -9
pkgs
tools
misc
+22 -9
pkgs/tools/misc/rauc/default.nix
···
-
{ autoreconfHook
-
, curl
+
{ curl
, dbus
, fetchFromGitHub
+
, fetchpatch
, glib
, json-glib
, lib
···
, openssl
, pkg-config
, stdenv
+
, meson
+
, ninja
+
, util-linux
+
, libnl
+
, systemd
}:
stdenv.mkDerivation rec {
···
sha256 = "sha256-VpHcJUTRZ5aJyfYypjVsYyRNrK0+9ci42mmlZQSkWAk=";
};
+
patches = [
+
(fetchpatch {
+
# Patch to install the man page when using meson, remove on package bump
+
url = "https://github.com/rauc/rauc/commit/756c677d031c435070a6900e6778d06961822261.patch";
+
hash = "sha256-QgIUagioRo61PeC0JyKjZtnauFiYP1Fz9wrxGEikBGI=";
+
})
+
];
passthru = {
updateScript = nix-update-script { };
};
enableParallelBuilding = true;
-
nativeBuildInputs = [ pkg-config autoreconfHook ];
+
nativeBuildInputs = [ pkg-config meson ninja ];
-
buildInputs = [ curl dbus glib json-glib openssl ];
+
buildInputs = [ curl dbus glib json-glib openssl util-linux libnl systemd ];
-
configureFlags = [
-
"--with-systemdunitdir=${placeholder "out"}/lib/systemd/system"
-
"--with-dbusinterfacesdir=${placeholder "out"}/share/dbus-1/interfaces"
-
"--with-dbuspolicydir=${placeholder "out"}/share/dbus-1/system.d"
-
"--with-dbussystemservicedir=${placeholder "out"}/share/dbus-1/system-services"
+
mesonFlags = [
+
"--buildtype=release"
+
(lib.mesonOption "systemdunitdir" "${placeholder "out"}/lib/systemd/system")
+
(lib.mesonOption "dbusinterfacesdir" "${placeholder "out"}/share/dbus-1/interfaces")
+
(lib.mesonOption "dbuspolicydir" "${placeholder "out"}/share/dbus-1/system.d")
+
(lib.mesonOption "dbussystemservicedir" "${placeholder "out"}/share/dbus-1/system-services")
];
meta = with lib; {