diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-12-25 18:01:39 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-12-25 18:01:39 +0100 |
commit | c6eece711e86acb7a93a8726eef4f92417356a2b (patch) | |
tree | 17b415f39d24874e9ff6d17740bdd419691021d0 | |
parent | 38582b0f32c4972836832062e7104dd15f08c7e6 (diff) | |
download | nixlib-c6eece711e86acb7a93a8726eef4f92417356a2b.tar nixlib-c6eece711e86acb7a93a8726eef4f92417356a2b.tar.gz nixlib-c6eece711e86acb7a93a8726eef4f92417356a2b.tar.bz2 nixlib-c6eece711e86acb7a93a8726eef4f92417356a2b.tar.lz nixlib-c6eece711e86acb7a93a8726eef4f92417356a2b.tar.xz nixlib-c6eece711e86acb7a93a8726eef4f92417356a2b.tar.zst nixlib-c6eece711e86acb7a93a8726eef4f92417356a2b.zip |
libmediaart: rename from gnome3.libmediaart
-rw-r--r-- | pkgs/desktops/gnome-3/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libmediaart/default.nix (renamed from pkgs/desktops/gnome-3/misc/libmediaart/default.nix) | 16 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 7f8b8743ee8c..72172cf96ac8 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -38,7 +38,7 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3 libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4 easytag meld orca rhythmbox shotwell gnome-usage - clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit; + clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; @@ -348,8 +348,6 @@ lib.makeScope pkgs.newScope (self: with self; { libgnome-games-support = callPackage ./misc/libgnome-games-support { }; - libmediaart = callPackage ./misc/libmediaart { }; - gexiv2 = callPackage ./misc/gexiv2 { }; gnome-applets = callPackage ./misc/gnome-applets { }; diff --git a/pkgs/desktops/gnome-3/misc/libmediaart/default.nix b/pkgs/development/libraries/libmediaart/default.nix index fac5db943871..48bd959009a1 100644 --- a/pkgs/desktops/gnome-3/misc/libmediaart/default.nix +++ b/pkgs/development/libraries/libmediaart/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, gobject-introspection, gnome3 }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk_pixbuf, gobject-introspection, gnome3 }: -let +stdenv.mkDerivation rec { pname = "libmediaart"; version = "1.9.4"; -in -stdenv.mkDerivation rec { - name = "${pname}-${version}"; + + outputs = [ "out" "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 = "a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d"; }; - nativeBuildInputs = [ pkgconfig gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkgconfig vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ]; buildInputs = [ glib gdk_pixbuf ]; + doCheck = true; + passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; versionPolicy = "none"; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 271197eb7245..cc0c320c2b27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10951,6 +10951,8 @@ in libmcrypt = callPackage ../development/libraries/libmcrypt {}; + libmediaart = callPackage ../development/libraries/libmediaart { }; + libmediainfo = callPackage ../development/libraries/libmediainfo { }; libmhash = callPackage ../development/libraries/libmhash {}; |