public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gexiv2: rename from gnome3.gexiv2

Browse Source
This commit is contained in:
Jan Tojnar 2018-12-25 18:43:33 +01:00
parent f6afec36fa
commit 73f32e7e58
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/gnome-3/default.nix
View File

@ -38,7 +38,7 @@ lib.makeScope pkgs.newScope (self: with self; {
inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3 inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4 libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4
easytag meld orca rhythmbox shotwell gnome-usage 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 libmediaart gfbgraph; clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2;
libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
@ -346,8 +346,6 @@ lib.makeScope pkgs.newScope (self: with self; {
libgnome-games-support = callPackage ./misc/libgnome-games-support { }; libgnome-games-support = callPackage ./misc/libgnome-games-support { };
gexiv2 = callPackage ./misc/gexiv2 { };
gnome-applets = callPackage ./misc/gnome-applets { }; gnome-applets = callPackage ./misc/gnome-applets { };
gnome-flashback = callPackage ./misc/gnome-flashback { }; gnome-flashback = callPackage ./misc/gnome-flashback { };

24
pkgs/desktops/gnome-3/misc/gexiv2/default.nix → pkgs/development/libraries/gexiv2/default.nix
View File

@ -1,29 +1,29 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, exiv2, glib, gnome3, gobject-introspection, vala }: { stdenv, fetchurl, meson, ninja, pkgconfig, exiv2, glib, gnome3, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }:
let stdenv.mkDerivation rec {
pname = "gexiv2"; pname = "gexiv2";
version = "0.10.9"; version = "0.10.9";
in
stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ];
name = "${pname}-${version}";
src = fetchurl { 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 = "1vf0zv92p9hybdhn7zx53h3ia53ph97a21xz8rfk877xlr5261l8"; sha256 = "1vf0zv92p9hybdhn7zx53h3ia53ph97a21xz8rfk877xlr5261l8";
}; };
preConfigure = '' nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ];
patchShebangs .
'';
nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala ];
buildInputs = [ glib ]; buildInputs = [ glib ];
propagatedBuildInputs = [ exiv2 ]; propagatedBuildInputs = [ exiv2 ];
mesonFlags = [
"-Denable-gtk-doc=true" # TODO: change to gtk_doc in a next release
];
doCheck = true;
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
packageName = pname; packageName = pname;
attrPath = "gnome3.${pname}";
}; };
}; };

4
pkgs/top-level/all-packages.nix
View File

@ -2873,6 +2873,8 @@ in
getopt = callPackage ../tools/misc/getopt { }; getopt = callPackage ../tools/misc/getopt { };
gexiv2 = callPackage ../development/libraries/gexiv2 { };
gftp = callPackage ../tools/networking/gftp { }; gftp = callPackage ../tools/networking/gftp { };
gfbgraph = callPackage ../development/libraries/gfbgraph { }; gfbgraph = callPackage ../development/libraries/gfbgraph { };
@ -5966,7 +5968,6 @@ in
viking = callPackage ../applications/misc/viking { viking = callPackage ../applications/misc/viking {
inherit (gnome2) scrollkeeper; inherit (gnome2) scrollkeeper;
inherit (gnome3) gexiv2;
}; };
vim-vint = callPackage ../development/tools/vim-vint { }; vim-vint = callPackage ../development/tools/vim-vint { };
@ -17221,7 +17222,6 @@ in
gimp = callPackage ../applications/graphics/gimp { gimp = callPackage ../applications/graphics/gimp {
gegl = gegl_0_4; gegl = gegl_0_4;
lcms = lcms2; lcms = lcms2;
inherit (gnome3) gexiv2;
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
inherit (darwin) cf-private; inherit (darwin) cf-private;
}; };