JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #112845 from rb2k/libdnf_update

Browse Source
This commit is contained in:
Sandro 2021-02-12 03:38:06 +01:00 committed by GitHub
commit 578d8ee695
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/tools/package-management/libdnf/darwin.patch
View File

@ -1,5 +1,25 @@
--- src/libdnf/hy-iutil.cpp 2020-12-02 07:53:42.000000000 -0800
+++ src/libdnf/hy-iutil.cpp 2020-12-21 14:24:14.000000000 -0800
diff --git src/libdnf/config.h src/libdnf/config.h
index 16121f6f..737d0bc4 100644
--- src/libdnf/config.h
+++ src/libdnf/config.h
@@ -18,7 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#ifdef __APPLE__
+#include <stdint.h>
+#else
#include <bits/wordsize.h>
+#endif
#if __WORDSIZE == 32
#include "config-32.h"
diff --git src/libdnf/hy-iutil.cpp src/libdnf/hy-iutil.cpp
index 497c560d..5de077fa 100644
--- src/libdnf/hy-iutil.cpp
+++ src/libdnf/hy-iutil.cpp
@@ -22,7 +22,7 @@
#include <errno.h>
#include <dirent.h>
@ -9,8 +29,10 @@
#include <pwd.h>
#include <unistd.h>
#include <stdio.h>
--- src/libdnf/hy-util.cpp 2020-12-02 07:53:42.000000000 -0800
+++ src/libdnf/hy-util.cpp 2020-12-21 14:23:21.000000000 -0800
diff --git src/libdnf/hy-util.cpp src/libdnf/hy-util.cpp
index 295fdc1b..9d584b8a 100644
--- src/libdnf/hy-util.cpp
+++ src/libdnf/hy-util.cpp
@@ -24,7 +24,20 @@
#include <ctype.h>
#include <sys/utsname.h>

6
pkgs/tools/package-management/libdnf/default.nix
View File

@ -1,15 +1,15 @@
{ gcc9Stdenv, lib, stdenv, fetchFromGitHub, cmake, gettext, pkg-config, gpgme, libsolv, openssl, check
, pcre, json_c, libmodulemd, libsmartcols, sqlite, librepo, libyaml, rpm }:
, json_c, libmodulemd, libsmartcols, sqlite, librepo, libyaml, rpm }:
gcc9Stdenv.mkDerivation rec {
pname = "libdnf";
version = "0.55.2";
version = "0.58.0";
src = fetchFromGitHub {
owner = "rpm-software-management";
repo = pname;
rev = version;
sha256 = "0hiydwfa90nsrqk5ffa6ks1g73wnsgjgq7z7gwq9jj76a7gpfbfq";
sha256 = "0an8giv0lm0qqc76fpmqg42ra081mlj62b9r0s1p0sgb3270l76l";
};
patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ];