diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-10-19 14:40:23 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-01-07 10:22:32 +0000 |
| commit | cc62bcb55359ba8c5e0fe3a48e778444c89060d8 (patch) | |
| tree | ca0e21d44eaf8837b687395e614445f7761d7bbd /nixpkgs/pkgs/development/libraries/grilo | |
| parent | d6625e8d25efd829c3cfa227d025ca4e606ae4b7 (diff) | |
| parent | a323570a264da96a0b0bcc1c9aa017794acdc752 (diff) | |
| download | nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.gz nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.bz2 nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.lz nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.xz nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.zst nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.zip | |
Merge commit 'a323570a264da96a0b0bcc1c9aa017794acdc752'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/grilo')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/grilo/default.nix | 68 |
1 files changed, 45 insertions, 23 deletions
diff --git a/nixpkgs/pkgs/development/libraries/grilo/default.nix b/nixpkgs/pkgs/development/libraries/grilo/default.nix index 172ae39536e6..16897c6f0446 100644 --- a/nixpkgs/pkgs/development/libraries/grilo/default.nix +++ b/nixpkgs/pkgs/development/libraries/grilo/default.nix @@ -1,40 +1,62 @@ -{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, pkg-config, gettext, vala, glib, liboauth, gtk3 -, gtk-doc, docbook_xsl, docbook_xml_dtd_43 -, libxml2, gnome, gobject-introspection, libsoup, totem-pl-parser }: +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, gettext +, vala +, glib +, liboauth +, gtk3 +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, libxml2 +, gnome +, gobject-introspection +, libsoup +, totem-pl-parser +}: -let +stdenv.mkDerivation rec { pname = "grilo"; - version = "0.3.13"; # if you change minor, also change ./setup-hook.sh -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "0.3.14"; # if you change minor, also change ./setup-hook.sh outputs = [ "out" "dev" "man" "devdoc" ]; outputBin = "dev"; + setupHook = ./setup-hook.sh; + src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0ywjvh7xw4ql1q4fvl0q5n06n08pga1g1nc9l7c3x5214gr3fj6i"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "A2nQsAuw9Zul966oz8Zl843xSltBgtKMfB4s0VtRh0M="; }; - patches = [ - (fetchpatch { - name = "CVE-2021-39365.patch"; - url = "https://gitlab.gnome.org/GNOME/grilo/-/commit/cd2472e506dafb1bb8ae510e34ad4797f63e263e.patch"; - sha256 = "1i1p21vlms43iawg4dl1dibnpsbnkx27kcfvllnx76q07bfrpwzm"; - }) - ]; - - setupHook = ./setup-hook.sh; - mesonFlags = [ "-Denable-gtk-doc=true" ]; nativeBuildInputs = [ - meson ninja pkg-config gettext gobject-introspection vala - gtk-doc docbook_xsl docbook_xml_dtd_43 + meson + ninja + pkg-config + gettext + gobject-introspection + vala + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + ]; + + buildInputs = [ + glib + liboauth + gtk3 + libxml2 + libsoup + totem-pl-parser ]; - buildInputs = [ glib liboauth gtk3 libxml2 libsoup totem-pl-parser ]; passthru = { updateScript = gnome.updateScript { @@ -47,7 +69,7 @@ in stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/Grilo"; description = "Framework that provides access to various sources of multimedia content, using a pluggable system"; maintainers = teams.gnome.members; - license = licenses.lgpl2; + license = licenses.lgpl2Plus; platforms = platforms.linux; }; } |