From da532d241da923eee08ff1f818019b3fb044e672 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Thu, 15 Aug 2024 09:30:39 +0200 Subject: [PATCH] libdnf: add missing pcre2 dependency, format Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- .../package-management/libdnf/default.nix | 69 ++++++++++--------- 1 file changed, 38 insertions(+), 31 deletions(-) diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix index a63dd347c029..ac510b954fee 100644 --- a/pkgs/tools/package-management/libdnf/default.nix +++ b/pkgs/tools/package-management/libdnf/default.nix @@ -1,32 +1,37 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, gettext -, pkg-config -, libsolv -, openssl -, check -, json_c -, libmodulemd -, libsmartcols -, sqlite -, librepo -, libyaml -, rpm -, zchunk -, cppunit -, python -, swig -, glib -, sphinx +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + gettext, + pkg-config, + libsolv, + openssl, + check, + json_c, + libmodulemd, + libsmartcols, + sqlite, + librepo, + libyaml, + rpm, + zchunk, + cppunit, + python, + swig, + pcre2, + sphinx, }: stdenv.mkDerivation rec { pname = "libdnf"; version = "0.73.3"; - outputs = [ "out" "dev" "py" ]; + outputs = [ + "out" + "dev" + "py" + ]; src = fetchFromGitHub { owner = "rpm-software-management"; @@ -53,6 +58,7 @@ stdenv.mkDerivation rec { python swig sphinx + pcre2.dev ]; propagatedBuildInputs = [ @@ -67,9 +73,7 @@ stdenv.mkDerivation rec { cp ${libsolv}/share/cmake/Modules/FindLibSolv.cmake cmake/modules/ ''; - patches = [ - ./fix-python-install-dir.patch - ]; + patches = [ ./fix-python-install-dir.patch ]; postPatch = '' # https://github.com/rpm-software-management/libdnf/issues/1518 @@ -82,7 +86,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWITH_GTKDOC=OFF" "-DWITH_HTML=OFF" - "-DPYTHON_DESIRED=${lib.head (lib.splitString ["."] python.version)}" + "-DPYTHON_DESIRED=${lib.head (lib.splitString [ "." ] python.version)}" ]; postInstall = '' @@ -93,12 +97,15 @@ stdenv.mkDerivation rec { moveToOutput "lib/${python.libPrefix}" "$py" ''; - meta = with lib; { + meta = { description = "Package management library"; homepage = "https://github.com/rpm-software-management/libdnf"; changelog = "https://github.com/rpm-software-management/libdnf/releases/tag/${version}"; - license = licenses.gpl2Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ rb2k katexochen ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ + rb2k + katexochen + ]; }; }