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

rpm-ostree: Move D-Bus conf file to share/dbus-1/system.d

Browse Source 
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
This commit is contained in:
worldofpeace 2019-09-16 11:54:56 -04:00
parent 61221dfdd5
commit dd6e2f773d
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
{ stdenv, fetchurl, ostree, rpm, which, autoconf, automake, libtool, pkgconfig, cargo, rustc, { stdenv, fetchurl, ostree, rpm, which, autoconf, automake, libtool, pkgconfig, cargo, rustc,
gobject-introspection, gtk-doc, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, 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, json_c, libmodulemd_1, utillinux, sqlite, cppunit }: bubblewrap, pcre, check, python, json_c, libmodulemd_1, utillinux, sqlite, cppunit, fetchpatch }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rpm-ostree"; pname = "rpm-ostree";
@ -17,6 +17,12 @@ stdenv.mkDerivation rec {
# https://github.com/NixOS/nixpkgs/pull/50953#issuecomment-449777169 # https://github.com/NixOS/nixpkgs/pull/50953#issuecomment-449777169
# https://github.com/NixOS/nixpkgs/pull/50953#issuecomment-452177080 # https://github.com/NixOS/nixpkgs/pull/50953#issuecomment-452177080
./fix-introspection-build.patch ./fix-introspection-build.patch
# Don't use etc/dbus-1/system.d
(fetchpatch {
url = "https://github.com/coreos/rpm-ostree/commit/60053d0d3d2279d120ae7007c6048e499d2c4d14.patch";
sha256 = "0ig21zip09iy2da7ksg87jykaj3q8jyzh8r7yrpzyql85qxiwm0m";
})
]; ];
outputs = [ "out" "dev" "man" "devdoc" ]; outputs = [ "out" "dev" "man" "devdoc" ];