Merge pull request #67935 from jtojnar/gnome-fixes

gnome3.gvfs: fix eval with allowAliases = false

nixos/modules/services/desktops/gnome3/glib-networking.nix

@@ -22,11 +22,11 @@ with lib;
 
   config = mkIf config.services.gnome3.glib-networking.enable {
 
-    services.dbus.packages = [ pkgs.gnome3.glib-networking ];
+    services.dbus.packages = [ pkgs.glib-networking ];
 
-    systemd.packages = [ pkgs.gnome3.glib-networking ];
+    systemd.packages = [ pkgs.glib-networking ];
 
-    environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gnome3.glib-networking.out}/lib/gio/modules" ];
+    environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.glib-networking.out}/lib/gio/modules" ];
 
   };
 

pkgs/desktops/gnome-2/default.nix

@@ -57,8 +57,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
 #### DESKTOP
 
-  gvfs = pkgs.gvfs.override { gnome = self; };
-
   # Removed from recent GNOME releases, but still required
   scrollkeeper = callPackage ./desktop/scrollkeeper { };
 
@@ -78,7 +76,10 @@ lib.makeScope pkgs.newScope (self: with self; {
     glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra-gtk2
 
     # Included for backwards compatibility
-    libsoup libwnck gtk-doc gnome-doc-utils rarian;
+    libsoup libwnck gtk-doc gnome-doc-utils rarian
+
+    gvfs # added 2019-09-03
+  ;
 
   gtk = pkgs.gtk2;
   gtkmm = pkgs.gtkmm2;

pkgs/desktops/gnome-3/default.nix

@@ -53,10 +53,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   gjs = callPackage ./core/gjs { };
 
-  glib-networking = pkgs.glib-networking.override {
-    inherit (pkgs) gsettings-desktop-schemas;
-  };
-
   gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
 
   gnome-bluetooth = callPackage ./core/gnome-bluetooth { };
@@ -111,7 +107,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   gucharmap = callPackage ./core/gucharmap { };
 
-  gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; };
+  gvfs = pkgs.gvfs.override { gnomeSupport = true; };
 
   eog = callPackage ./core/eog { };
 
@@ -348,6 +344,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16
   inherit (pkgs) gnome-video-effects; # added 2019-08-19
   inherit (pkgs) gnome-online-accounts grilo grilo-plugins tracker tracker-miners gnome-photos; # added 2019-08-23
+  inherit (pkgs) glib-networking; # added 2019-09-02
 
   defaultIconTheme = adwaita-icon-theme;
   gtk = gtk3;

pkgs/development/libraries/gvfs/default.nix

@@ -1,20 +1,49 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, dbus
+{ stdenv
-, glib, libgudev, udisks2, libgcrypt, libcap, polkit
+, fetchurl
-, libgphoto2, avahi, libarchive, fuse, libcdio
+, meson
-, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp
+, ninja
-, gnomeSupport ? false, gnome, gcr, wrapGAppsHook
+, pkgconfig
-, libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh
+, gettext
-, libsecret, libgdata, python3
+, dbus
+, glib
+, libgudev
+, udisks2
+, libgcrypt
+, libcap
+, polkit
+, libgphoto2
+, avahi
+, libarchive
+, fuse
+, libcdio
+, libxml2
+, libxslt
+, docbook_xsl
+, docbook_xml_dtd_42
+, samba
+, libmtp
+, gnomeSupport ? false
+, gnome3
+, gcr
+, glib-networking
+, gnome-online-accounts
+, wrapGAppsHook
+, libimobiledevice
+, libbluray
+, libcdio-paranoia
+, libnfs
+, openssh
+, libsecret
+, libgdata
+, python3
 }:
 
-let
+stdenv.mkDerivation rec {
   pname = "gvfs";
   version = "1.40.2";
-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 = "07lpcfric3h0302n9b1pwa38mjb76r9s98kg2867y2d1qvzfivxx";
   };
 
@@ -26,28 +55,56 @@ in stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [
-    meson ninja python3
+    meson
-    pkgconfig gettext wrapGAppsHook
+    ninja
-    libxml2 libxslt docbook_xsl docbook_xml_dtd_42
+    python3
+    pkgconfig
+    gettext
+    wrapGAppsHook
+    libxml2
+    libxslt
+    docbook_xsl
+    docbook_xml_dtd_42
   ];
 
   buildInputs = [
-    glib libgudev udisks2 libgcrypt dbus
+    glib
-    libgphoto2 avahi libarchive fuse libcdio
+    libgudev
-    samba libmtp libcap polkit libimobiledevice libbluray
+    udisks2
-    libcdio-paranoia libnfs openssh
+    libgcrypt
-    # ToDo: a ligther version of libsoup to have FTP/HTTP support?
+    dbus
-  ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [
+    libgphoto2
-    libsoup gcr
+    avahi
+    libarchive
+    fuse
+    libcdio
+    samba
+    libmtp
+    libcap
+    polkit
+    libimobiledevice
+    libbluray
+    libcdio-paranoia
+    libnfs
+    openssh
+    # TODO: a ligther version of libsoup to have FTP/HTTP support?
+  ] ++ stdenv.lib.optionals gnomeSupport [
+    gnome3.libsoup
+    gcr
     glib-networking # TLS support
-    gnome-online-accounts libsecret libgdata
+    gnome-online-accounts
-  ]);
+    libsecret
+    libgdata
+  ];
 
   mesonFlags = [
     "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
     "-Dtmpfilesdir=no"
   ] ++ stdenv.lib.optionals (!gnomeSupport) [
-    "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false"
+    "-Dgcr=false"
+    "-Dgoa=false"
+    "-Dkeyring=false"
+    "-Dhttp=false"
     "-Dgoogle=false"
   ] ++ stdenv.lib.optionals (samba == null) [
     # Xfce don't want samba

pkgs/top-level/all-packages.nix

@@ -11267,9 +11267,7 @@ in
 
   gumbo = callPackage ../development/libraries/gumbo { };
 
-  gvfs = callPackage ../development/libraries/gvfs {
+  gvfs = callPackage ../development/libraries/gvfs { };
-    gnome = res.gnome3;
-  };
 
   gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { };