dconf-editor: Move from gnome scope to top-level

3 files changed, 1 insertions, 96 deletions

diff --git a/pkgs/desktops/gnome/core/dconf-editor/default.nix b/pkgs/desktops/gnome/core/dconf-editor/default.nix
deleted file mode 100644
index 2b1b747a74a2c..0000000000000
--- a/pkgs/desktops/gnome/core/dconf-editor/default.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, fetchpatch
-, desktop-file-utils
-, meson
-, ninja
-, vala
-, libxslt
-, pkg-config
-, glib
-, gtk3
-, libhandy
-, gnome
-, dconf
-, libxml2
-, gettext
-, docbook-xsl-nons
-, wrapGAppsHook3
-, gobject-introspection
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dconf-editor";
-  version = "45.0.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-EYApdnju2uYhfMUUomOMGH0vHR7ycgy5B5t0DEKZQd0=";
-  };
-
-  patches = [
-    # Fix crash with GSETTINGS_SCHEMA_DIR env var.
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/dconf-editor/-/commit/baf183737d459dcde065c9f8f6fe5be7ed874de6.patch";
-      hash = "sha256-Vp0qjJChDr6IarUD+tZPLJhdI8v8r6EzWNfqFSnGvqQ=";
-    })
-
-    # Look for compiled schemas in NIX_GSETTINGS_OVERRIDES_DIR
-    # environment variable, to match what we patched GLib to do.
-    ./schema-override-variable.patch
-  ];
-
-  nativeBuildInputs = [
-    desktop-file-utils
-    meson
-    ninja
-    vala
-    libxslt
-    pkg-config
-    wrapGAppsHook3
-    gettext
-    docbook-xsl-nons
-    libxml2
-    gobject-introspection
-  ];
-
-  buildInputs = [
-    glib
-    gtk3
-    libhandy
-    dconf
-  ];
-
-  passthru = {
-    updateScript = gnome.updateScript {
-      packageName = pname;
-      attrPath = "gnome.${pname}";
-    };
-  };
-
-  meta = with lib; {
-    description = "GSettings editor for GNOME";
-    mainProgram = "dconf-editor";
-    homepage = "https://apps.gnome.org/DconfEditor/";
-    license = licenses.gpl3Plus;
-    maintainers = teams.gnome.members;
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/desktops/gnome/core/dconf-editor/schema-override-variable.patch b/pkgs/desktops/gnome/core/dconf-editor/schema-override-variable.patch
deleted file mode 100644
index 06896d1aa4ee8..0000000000000
--- a/pkgs/desktops/gnome/core/dconf-editor/schema-override-variable.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/editor/source-manager.vala b/editor/source-manager.vala
-index 27b2b17a..87f7ba86 100644
---- a/editor/source-manager.vala
-+++ b/editor/source-manager.vala
-@@ -121,6 +121,9 @@ private class SourceManager : Object
-             source = try_prepend_dir (source, Path.build_filename (system_data_dirs [i], "glib-2.0", "schemas"));
-         string user_data_dir = GLib.Environment.get_user_data_dir ();
-         source = try_prepend_dir (source, Path.build_filename (user_data_dir, "glib-2.0", "schemas"));
-+        string? nix_var_schema_dir = GLib.Environment.get_variable ("NIX_GSETTINGS_OVERRIDES_DIR");
-+        if (nix_var_schema_dir != null)
-+            source = try_prepend_dir (source, (!) nix_var_schema_dir);
-         string? var_schema_dir = GLib.Environment.get_variable ("GSETTINGS_SCHEMA_DIR");
-         if (var_schema_dir != null) {
-             string[] extra_schema_dirs = ((!) var_schema_dir).split (Path.SEARCHPATH_SEPARATOR_S);
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 9c340550a54b6..6b4b4ad20fe94 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -22,8 +22,6 @@ in
 
   caribou = callPackage ./core/caribou { };
 
-  dconf-editor = callPackage ./core/dconf-editor { };
-
   gdm = callPackage ./core/gdm { };
 
   gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
@@ -210,6 +208,7 @@ in
 
   adwaita-icon-theme = lib.warn "The ‘gnome.adwaita-icon-theme’ was moved to top-level. Please use ‘pkgs.adwaita-icon-theme’ directly." pkgs.adwaita-icon-theme; # Added on 2024-06-22.
   baobab = lib.warn "The ‘gnome.baobab’ was moved to top-level. Please use ‘pkgs.baobab’ directly." pkgs.baobab; # Added on 2024-06-22.
+  dconf-editor = lib.warn "The ‘gnome.dconf-editor’ was moved to top-level. Please use ‘pkgs.dconf-editor’ directly." pkgs.dconf-editor; # Added on 2024-06-22.
   devhelp = lib.warn "The ‘gnome.devhelp’ was moved to top-level. Please use ‘pkgs.devhelp’ directly." pkgs.devhelp; # Added on 2024-06-22.
   eog = lib.warn "The ‘gnome.eog’ was moved to top-level. Please use ‘pkgs.eog’ directly." pkgs.eog; # Added on 2024-06-22.
   epiphany = lib.warn "The ‘gnome.epiphany’ was moved to top-level. Please use ‘pkgs.epiphany’ directly." pkgs.epiphany; # Added on 2024-06-22.