diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-12-25 04:34:57 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-12-25 17:21:09 +0100 |
commit | 7ca5ec11b0333b74f0dbb13518953b8f830ce0bd (patch) | |
tree | 8f141ee6cf94a032c704071af406cd47209dec0d /pkgs/desktops/gnome-3 | |
parent | df89d4ce4100413e873ae05efae0b174ede83a6f (diff) | |
download | nixlib-7ca5ec11b0333b74f0dbb13518953b8f830ce0bd.tar nixlib-7ca5ec11b0333b74f0dbb13518953b8f830ce0bd.tar.gz nixlib-7ca5ec11b0333b74f0dbb13518953b8f830ce0bd.tar.bz2 nixlib-7ca5ec11b0333b74f0dbb13518953b8f830ce0bd.tar.lz nixlib-7ca5ec11b0333b74f0dbb13518953b8f830ce0bd.tar.xz nixlib-7ca5ec11b0333b74f0dbb13518953b8f830ce0bd.tar.zst nixlib-7ca5ec11b0333b74f0dbb13518953b8f830ce0bd.zip |
libgee: rename from gnome3.libgee
Diffstat (limited to 'pkgs/desktops/gnome-3')
-rw-r--r-- | pkgs/desktops/gnome-3/core/libgee/default.nix | 38 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/default.nix | 4 |
2 files changed, 1 insertions, 41 deletions
diff --git a/pkgs/desktops/gnome-3/core/libgee/default.nix b/pkgs/desktops/gnome-3/core/libgee/default.nix deleted file mode 100644 index 2de8b430843c..000000000000 --- a/pkgs/desktops/gnome-3/core/libgee/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobject-introspection, gnome3 }: -let - pname = "libgee"; - version = "0.20.1"; -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 = "0c26x8gi3ivmhlbqcmiag4jwrkvcy28ld24j55nqr3jikb904a5v"; - }; - - doCheck = true; - - nativeBuildInputs = [ pkgconfig autoconf vala gobject-introspection ]; - buildInputs = [ glib ]; - - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0"; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with stdenv.lib; { - description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; - homepage = https://wiki.gnome.org/Projects/Libgee; - license = licenses.lgpl21Plus; - platforms = platforms.unix; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 963275db1ed7..38a73fcd0521 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; + clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; @@ -161,8 +161,6 @@ lib.makeScope pkgs.newScope (self: with self; { eog = callPackage ./core/eog { }; - libgee = callPackage ./core/libgee { }; - libgweather = callPackage ./core/libgweather { }; libzapojit = callPackage ./core/libzapojit { }; |