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

rpm-ostree: 2018.5 → 2019.1

This commit is contained in:
Jan Tojnar 2018-11-23 15:06:22 +01:00
parent 2a92edfbc4
commit c0ffbe8f37
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 28 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
pkgs/tools/misc/rpm-ostree/default.nix
View File

@ -1,39 +1,28 @@
{ stdenv, fetchpatch, fetchFromGitHub, ostree, rpm, which, autoconf, automake, libtool, pkgconfig, { stdenv, fetchurl, ostree, rpm, which, autoconf, automake, libtool, pkgconfig, cargo, rustc,
gobject-introspection, gtk-doc, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, gperf, cmake, gobject-introspection, gtk-doc, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gperf, cmake,
libcap, glib, systemd, json-glib, libarchive, libsolv, librepo, polkit, libcap, glib, systemd, json-glib, libarchive, libsolv, librepo, polkit,
bubblewrap, pcre, check, python }: bubblewrap, pcre, check, python }:
let stdenv.mkDerivation rec {
libglnx-src = fetchFromGitHub { pname = "rpm-ostree";
owner = "GNOME"; version = "2019.1";
repo = "libglnx";
rev = "97b5c08d2f93dc93ba296a84bbd2a5ab9bd8fc97"; src = fetchurl {
sha256 = "0cz4x63f6ys7dln54g6mrr7hksvqwz78wdc8qb7zr1h2cp1azcvs"; url = "https://github.com/projectatomic/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "14qk8mq5yc67j3wl3fa9xnhh8ii8x5qdiavf7ybw7mp4ma4lwa8k";
}; };
libdnf-src = fetchFromGitHub { patches = [
owner = "rpm-software-management"; # gobject-introspection requires curl in cflags
repo = "libdnf"; # https://github.com/NixOS/nixpkgs/pull/50953#issuecomment-449777169
rev = "b3fcc53f6f3baf4f51f836f5e1eb54eb82d5df49"; # https://github.com/NixOS/nixpkgs/pull/50953#issuecomment-452177080
sha256 = "15nl9x4blyc9922rvz7iq56yy8hxhpsf31cs3ag7aypqpfx3czci"; ./fix-introspection-build.patch
}; ];
version = "2018.5";
in stdenv.mkDerivation {
name = "rpm-ostree-${version}";
outputs = [ "out" "dev" "man" "devdoc" ]; outputs = [ "out" "dev" "man" "devdoc" ];
src = fetchFromGitHub {
rev = "v${version}";
owner = "projectatomic";
repo = "rpm-ostree";
sha256 = "0y37hr8mmrsww4ka2hlqmz7wp57ibzhah4j87yg8q8dks5hxcbsx";
};
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig which autoconf automake libtool cmake gperf pkgconfig which autoconf automake libtool cmake gperf cargo rustc
gobject-introspection gtk-doc libxml2 libxslt docbook_xsl docbook_xml_dtd_42 gobject-introspection gtk-doc libxml2 libxslt docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_43
]; ];
buildInputs = [ buildInputs = [
libcap ostree rpm glib systemd polkit bubblewrap libcap ostree rpm glib systemd polkit bubblewrap
@ -41,14 +30,6 @@ in stdenv.mkDerivation {
pcre check python pcre check python
]; ];
patches = [
# Use gdbus-codegen from PATH
(fetchpatch {
url = https://github.com/projectatomic/rpm-ostree/commit/315406d8cd0937e786723986e88d376c88806c60.patch;
sha256 = "073yfa62515kyf58s0sz56w0a40062lh761y2y4assqipybwxbvp";
})
];
configureFlags = [ configureFlags = [
"--enable-gtk-doc" "--enable-gtk-doc"
"--with-bubblewrap=${bubblewrap}/bin/bwrap" "--with-bubblewrap=${bubblewrap}/bin/bwrap"
@ -57,16 +38,9 @@ in stdenv.mkDerivation {
dontUseCmakeConfigure = true; dontUseCmakeConfigure = true;
prePatch = '' prePatch = ''
rmdir libglnx libdnf
cp --no-preserve=mode -r ${libglnx-src} libglnx
cp --no-preserve=mode -r ${libdnf-src} libdnf
# According to #cmake on freenode, libdnf should bundle the FindLibSolv.cmake module # According to #cmake on freenode, libdnf should bundle the FindLibSolv.cmake module
cp ${libsolv}/share/cmake/Modules/FindLibSolv.cmake libdnf/cmake/modules/ cp ${libsolv}/share/cmake/Modules/FindLibSolv.cmake libdnf/cmake/modules/
# libdnf normally wants sphinx to build its hawkey manpages, but we don't care about those manpages since we don't use hawkey
substituteInPlace configure.ac --replace 'cmake \' 'cmake -DWITH_MAN=off \'
# Let's not hardcode the rpm-gpg path... # Let's not hardcode the rpm-gpg path...
substituteInPlace libdnf/libdnf/dnf-keyring.cpp \ substituteInPlace libdnf/libdnf/dnf-keyring.cpp \
--replace '"/etc/pki/rpm-gpg"' 'getenv("LIBDNF_RPM_GPG_PATH_OVERRIDE") ? getenv("LIBDNF_RPM_GPG_PATH_OVERRIDE") : "/etc/pki/rpm-gpg"' --replace '"/etc/pki/rpm-gpg"' 'getenv("LIBDNF_RPM_GPG_PATH_OVERRIDE") ? getenv("LIBDNF_RPM_GPG_PATH_OVERRIDE") : "/etc/pki/rpm-gpg"'
@ -84,4 +58,3 @@ in stdenv.mkDerivation {
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

11
pkgs/tools/misc/rpm-ostree/fix-introspection-build.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/configure.ac
+++ b/configure.ac
@@ -103,7 +103,7 @@
ostree-1 >= 2018.9
libsystemd
polkit-gobject-1
- rpm librepo libsolv
+ rpm librepo libsolv libcurl
libarchive])
dnl -ldl: https://github.com/ostreedev/ostree/commit/1f832597fc83fda6cb8daf48c4495a9e1590774c