diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
commit | e0794be8a0d11e90461e5a9c85012a36b93ec976 (patch) | |
tree | efd9cbc55ea3322867bf601c4d536758a3dd5fcc /nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas | |
parent | 3538874082ded7647b1ccec0343c7c1e882cfef3 (diff) | |
parent | 1a57d96edd156958b12782e8c8b6a374142a7248 (diff) | |
download | nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.gz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.bz2 nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.lz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.xz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.zst nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.zip |
Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix | 50 |
1 files changed, 34 insertions, 16 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index 6a94944e9f18..1032f15196cc 100644 --- a/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -1,22 +1,41 @@ -{ stdenv, fetchurl, pkgconfig, glib, gobject-introspection +{ stdenv +, fetchurl +, pkgconfig +, glib +, gobject-introspection , meson , ninja , python3 # just for passthru -, gnome3 }: +, gnome3 +}: stdenv.mkDerivation rec { pname = "gsettings-desktop-schemas"; - version = "3.36.1"; + version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1nf97vq07gadwdla6kws8z510xlmv0a7wlyqwwnhyagq7kjdnjq0"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0rwcg9sd5rv7gjwapcd1jjk6l16w0p3j7wkicq1rdch4c0kch12p"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gsettings-desktop-schemas"; }; - }; + nativeBuildInputs = [ + glib + meson + ninja + pkgconfig + python3 + ]; + + buildInputs = [ + glib + gobject-introspection + ]; + + postPatch = '' + chmod +x build-aux/meson/post-install.py + patchShebangs build-aux/meson/post-install.py + ''; # meson installs the schemas to share/glib-2.0/schemas # We add the override file there too so it will be compiled and later moved by @@ -32,16 +51,15 @@ stdenv.mkDerivation rec { EOF ''; - postPatch = '' - chmod +x build-aux/meson/post-install.py - patchShebangs build-aux/meson/post-install.py - ''; - - buildInputs = [ glib gobject-introspection ]; - - nativeBuildInputs = [ pkgconfig python3 meson ninja glib ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; meta = with stdenv.lib; { + description = "Collection of GSettings schemas for settings shared by various components of a desktop"; + license = licenses.lgpl21Plus; maintainers = teams.gnome.members; }; } |