diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-12-25 17:48:38 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-12-25 17:50:21 +0100 |
commit | 38582b0f32c4972836832062e7104dd15f08c7e6 (patch) | |
tree | fb86d87250a4eb6a16856daa3b646702dcb6e1fe /pkgs/desktops | |
parent | 0f0179c2fa6ac404d2f54f159cd43716b22e5b07 (diff) | |
download | nixpkgs-38582b0f32c4972836832062e7104dd15f08c7e6.tar nixpkgs-38582b0f32c4972836832062e7104dd15f08c7e6.tar.gz nixpkgs-38582b0f32c4972836832062e7104dd15f08c7e6.tar.bz2 nixpkgs-38582b0f32c4972836832062e7104dd15f08c7e6.tar.lz nixpkgs-38582b0f32c4972836832062e7104dd15f08c7e6.tar.xz nixpkgs-38582b0f32c4972836832062e7104dd15f08c7e6.tar.zst nixpkgs-38582b0f32c4972836832062e7104dd15f08c7e6.zip |
libzapojit: rename from gnome3.libzapojit
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/gnome-3/core/libzapojit/default.nix | 32 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/default.nix | 4 |
2 files changed, 1 insertions, 35 deletions
diff --git a/pkgs/desktops/gnome-3/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/core/libzapojit/default.nix deleted file mode 100644 index 5c029176787..00000000000 --- a/pkgs/desktops/gnome-3/core/libzapojit/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, intltool, json-glib, rest, libsoup, gnome-online-accounts, gnome3, gobject-introspection }: -let - pname = "libzapojit"; - version = "0.0.3"; -in -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"; - }; - - nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; - propagatedBuildInputs = [ glib json-glib rest libsoup gnome-online-accounts ]; # zapojit-0.0.pc - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with stdenv.lib; { - description = "GObject wrapper for the SkyDrive and Hotmail REST APIs"; - license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index a9708f7b2e1..7f8b8743ee8 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; + 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; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; @@ -160,8 +160,6 @@ lib.makeScope pkgs.newScope (self: with self; { eog = callPackage ./core/eog { }; - libzapojit = callPackage ./core/libzapojit { }; - 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 |