diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-12-25 04:17:20 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-12-25 17:21:08 +0100 |
| commit | 878d289c6ff4d87e344d8ee3481ded0e8d110bb7 (patch) | |
| tree | fc870a6aa609492ef1181e957dbe9c2bfcaaaab0 /pkgs | |
| parent | d6ab3a534fc7ee156c5d457acbb122ea81d8ce2a (diff) | |
| download | nixlib-878d289c6ff4d87e344d8ee3481ded0e8d110bb7.tar nixlib-878d289c6ff4d87e344d8ee3481ded0e8d110bb7.tar.gz nixlib-878d289c6ff4d87e344d8ee3481ded0e8d110bb7.tar.bz2 nixlib-878d289c6ff4d87e344d8ee3481ded0e8d110bb7.tar.lz nixlib-878d289c6ff4d87e344d8ee3481ded0e8d110bb7.tar.xz nixlib-878d289c6ff4d87e344d8ee3481ded0e8d110bb7.tar.zst nixlib-878d289c6ff4d87e344d8ee3481ded0e8d110bb7.zip | |
libgepub: rename from gnome3.libgepub
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/gnome-3/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/libgepub/default.nix (renamed from pkgs/desktops/gnome-3/core/libgepub/default.nix) | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index b88180c61669..6873cc0e82dd 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; + clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; @@ -165,8 +165,6 @@ lib.makeScope pkgs.newScope (self: with self; { libgee = callPackage ./core/libgee { }; - libgepub = callPackage ./core/libgepub { }; - libpeas = callPackage ./core/libpeas {}; libgweather = callPackage ./core/libgweather { }; diff --git a/pkgs/desktops/gnome-3/core/libgepub/default.nix b/pkgs/development/libraries/libgepub/default.nix index 26531a61ffaa..70ec222f88fb 100644 --- a/pkgs/desktops/gnome-3/core/libgepub/default.nix +++ b/pkgs/development/libraries/libgepub/default.nix @@ -1,14 +1,12 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, gnome3 , webkitgtk, libsoup, libxml2, libarchive }: -let +stdenv.mkDerivation rec { pname = "libgepub"; version = "0.6.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; 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 = "16dkyywqdnfngmwsgbyga0kl9vcnzczxi3lmhm27pifrq5f3k2n7"; }; @@ -20,7 +18,6 @@ in stdenv.mkDerivation rec { 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 ea302c2d7004..fb72a72d8615 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10768,6 +10768,8 @@ in libgdata = callPackage ../development/libraries/libgdata { }; + libgepub = callPackage ../development/libraries/libgepub { }; + libgig = callPackage ../development/libraries/libgig { }; libgnome-keyring = callPackage ../development/libraries/libgnome-keyring { }; |