Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4b706490da93
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cae8d97c232f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Apr 16, 2020

  1. dconf: format with nixpkgs-fmt 

    Also:

* use pname + version instead of name
* reorder attributes
* change platforms linux + darwin → unix
    @jtojnar
    jtojnar committed Apr 16, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    LnL7 Daiderd Jordan
    GPG key ID: D02435D05B810C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a3b69ac View commit details

  2. dconf: fix build

    @jtojnar
    jtojnar committed Apr 16, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    LnL7 Daiderd Jordan
    GPG key ID: D02435D05B810C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cae8d97 View commit details
Showing with 55 additions and 16 deletions.
  1. +55 −16 pkgs/development/libraries/dconf/default.nix
71 changes: 55 additions & 16 deletions pkgs/development/libraries/dconf/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,61 @@
{ stdenv, fetchurl, meson, ninja, python3, vala, libxslt, pkgconfig, glib, bash-completion, dbus, gnome3
, libxml2, gtk-doc, docbook_xsl, docbook_xml_dtd_42 }:
{ stdenv
, fetchurl
, fetchpatch
, 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";

outputs = [ "out" "lib" "dev" "devdoc" ];

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.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
'';
patches = [
# Fix bash-completion installation
# https://gitlab.gnome.org/GNOME/dconf/merge_requests/58
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/dconf/commit/b3c9423c6151f3c28e526083ea2f04987a780fdf.patch";
sha256 = "zrIPKmgEpa1iIGUKv03+z+GNwJwgdf2hDATgP3i8qk0=";
})
];

outputs = [ "out" "lib" "dev" "devdoc" ];
nativeBuildInputs = [
meson
ninja
vala
pkg-config
python3
libxslt
libxml2
glib
gtk-doc
docbook-xsl-nons
docbook_xml_dtd_42
];

nativeBuildInputs = [ meson ninja vala pkgconfig python3 libxslt libxml2 glib gtk-doc docbook_xsl docbook_xml_dtd_42 ];
buildInputs = [ glib bash-completion dbus ];
buildInputs = [
glib
bash-completion
dbus
];

mesonFlags = [
"--sysconfdir=/etc"
@@ -31,6 +64,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 +79,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;
};
}