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

libzapojit: rename from gnome3.libzapojit

Browse Source
This commit is contained in:
Jan Tojnar 2018-12-25 17:48:38 +01:00
parent 0f0179c2fa
commit 38582b0f32
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
3 changed files with 9 additions and 11 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; clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit;
libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
@ -160,8 +160,6 @@ lib.makeScope pkgs.newScope (self: with self; {
eog = callPackage ./core/eog { }; eog = callPackage ./core/eog { };
libzapojit = callPackage ./core/libzapojit { };
mutter = callPackage ./core/mutter { }; mutter = callPackage ./core/mutter { };
# Needed for elementary's gala and greeter until they get around to adapting to all the API breaking changes in libmutter-3 # Needed for elementary's gala and greeter until they get around to adapting to all the API breaking changes in libmutter-3

14
pkgs/desktops/gnome-3/core/libzapojit/default.nix → pkgs/development/libraries/libzapojit/default.nix
View File

@ -1,30 +1,28 @@
{ stdenv, fetchurl, pkgconfig, glib, intltool, json-glib, rest, libsoup, gnome-online-accounts, gnome3, gobject-introspection }: { stdenv, fetchurl, pkgconfig, glib, intltool, json-glib, librest, libsoup, gnome3, gobject-introspection }:
let
stdenv.mkDerivation rec {
pname = "libzapojit"; pname = "libzapojit";
version = "0.0.3"; version = "0.0.3";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
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 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"; sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x";
}; };
nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; nativeBuildInputs = [ pkgconfig intltool gobject-introspection ];
propagatedBuildInputs = [ glib json-glib rest libsoup gnome-online-accounts ]; # zapojit-0.0.pc propagatedBuildInputs = [ glib json-glib librest libsoup gnome3.gnome-online-accounts ]; # zapojit-0.0.pc
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
packageName = pname; packageName = pname;
attrPath = "gnome3.${pname}";
}; };
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "GObject wrapper for the SkyDrive and Hotmail REST APIs"; description = "GObject wrapper for the SkyDrive and Hotmail REST APIs";
homepage = https://wiki.gnome.org/Projects/Zapojit;
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
maintainers = gnome3.maintainers; maintainers = gnome3.maintainers;
platforms = platforms.linux; platforms = platforms.linux;

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

@ -11500,6 +11500,8 @@ in
libyubikey = callPackage ../development/libraries/libyubikey { }; libyubikey = callPackage ../development/libraries/libyubikey { };
libzapojit = callPackage ../development/libraries/libzapojit { };
libzen = callPackage ../development/libraries/libzen { }; libzen = callPackage ../development/libraries/libzen { };
libzip = callPackage ../development/libraries/libzip { }; libzip = callPackage ../development/libraries/libzip { };