diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 0f7b9f75d1a..f15f4825aa1 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; + clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; @@ -169,8 +169,6 @@ lib.makeScope pkgs.newScope (self: with self; { libgdata = callPackage ./core/libgdata { }; - libgxps = callPackage ./core/libgxps { }; - libpeas = callPackage ./core/libpeas {}; libgweather = callPackage ./core/libgweather { }; diff --git a/pkgs/desktops/gnome-3/core/libgxps/default.nix b/pkgs/development/libraries/libgxps/default.nix similarity index 91% rename from pkgs/desktops/gnome-3/core/libgxps/default.nix rename to pkgs/development/libraries/libgxps/default.nix index 852a546f4bf..3b7f29de573 100644 --- a/pkgs/desktops/gnome-3/core/libgxps/default.nix +++ b/pkgs/development/libraries/libgxps/default.nix @@ -2,14 +2,12 @@ , libarchive, freetype, libjpeg, libtiff, gnome3, fetchpatch }: -let +stdenv.mkDerivation rec { pname = "libgxps"; version = "0.3.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 = "412b1343bd31fee41f7204c47514d34c563ae34dafa4cc710897366bd6cd0fae"; }; @@ -38,7 +36,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 d89ecf338d4..2d864ae7547 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10783,6 +10783,8 @@ in libgrss = callPackage ../development/libraries/libgrss { }; + libgxps = callPackage ../development/libraries/libgxps { }; + libiio = callPackage ../development/libraries/libiio { }; libseccomp = callPackage ../development/libraries/libseccomp { };