dconf: format with nixpkgs-fmt

Also:

* use pname + version instead of name
* reorder attributes
* change platforms linux + darwin → unix
This commit is contained in:
Jan Tojnar 2020-04-16 11:17:10 +02:00
parent 4b706490da
commit a3b69ac641
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4

View File

@ -1,28 +1,51 @@
{ stdenv, fetchurl, meson, ninja, python3, vala, libxslt, pkgconfig, glib, bash-completion, dbus, gnome3
, libxml2, gtk-doc, docbook_xsl, docbook_xml_dtd_42 }:
{ stdenv
, fetchurl
, meson
, ninja
, python3
, vala
, libxslt
, pkg-config
, glib
, bash-completion
, dbus
, gnome3
, libxml2
, gtk-doc
, docbook-xsl-nons
, docbook_xml_dtd_42
}:
let
pname = "dconf";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "dconf";
version = "0.36.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0bfs069pjv6lhp7xrzmrhz3876ay2ryqxzc6mlva1hhz34ibprlz";
};
postPatch = ''
chmod +x meson_post_install.py tests/test-dconf.py
patchShebangs meson_post_install.py
patchShebangs tests/test-dconf.py
'';
outputs = [ "out" "lib" "dev" "devdoc" ];
nativeBuildInputs = [ meson ninja vala pkgconfig python3 libxslt libxml2 glib gtk-doc docbook_xsl docbook_xml_dtd_42 ];
buildInputs = [ glib bash-completion dbus ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0bfs069pjv6lhp7xrzmrhz3876ay2ryqxzc6mlva1hhz34ibprlz";
};
nativeBuildInputs = [
meson
ninja
vala
pkg-config
python3
libxslt
libxml2
glib
gtk-doc
docbook-xsl-nons
docbook_xml_dtd_42
];
buildInputs = [
glib
bash-completion
dbus
];
mesonFlags = [
"--sysconfdir=/etc"
@ -31,6 +54,12 @@ stdenv.mkDerivation rec {
doCheck = !stdenv.isAarch32 && !stdenv.isAarch64 && !stdenv.isDarwin;
postPatch = ''
chmod +x meson_post_install.py tests/test-dconf.py
patchShebangs meson_post_install.py
patchShebangs tests/test-dconf.py
'';
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
@ -40,7 +69,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = "https://wiki.gnome.org/Projects/dconf";
license = licenses.lgpl21Plus;
platforms = platforms.linux ++ platforms.darwin;
platforms = platforms.unix;
maintainers = teams.gnome.members;
};
}