about summary refs log tree commit diff
path: root/pkgs/desktops/gnome
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/desktops/gnome')
-rw-r--r--pkgs/desktops/gnome/core/epiphany/default.nix109
-rw-r--r--pkgs/desktops/gnome/default.nix3
2 files changed, 1 insertions, 111 deletions
diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix
deleted file mode 100644
index c4edd298aff75..0000000000000
--- a/pkgs/desktops/gnome/core/epiphany/default.nix
+++ /dev/null
@@ -1,109 +0,0 @@
-{ lib
-, stdenv
-, meson
-, ninja
-, gettext
-, fetchurl
-, pkg-config
-, gtk4
-, glib
-, icu
-, wrapGAppsHook4
-, gnome
-, libportal-gtk4
-, libxml2
-, itstool
-, webkitgtk_6_0
-, libsoup_3
-, glib-networking
-, libsecret
-, gnome-desktop
-, libarchive
-, p11-kit
-, sqlite
-, gcr_4
-, isocodes
-, desktop-file-utils
-, nettle
-, gdk-pixbuf
-, gst_all_1
-, json-glib
-, libadwaita
-, buildPackages
-, withPantheon ? false
-, pantheon
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "epiphany";
-  version = "46.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/epiphany/${lib.versions.major finalAttrs.version}/epiphany-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Jg+BRp7WR0bCsRQ/Lzi+3NloR3hlZ7CX2fcv072dsUI=";
-  };
-
-  nativeBuildInputs = [
-    desktop-file-utils
-    gettext
-    itstool
-    meson
-    ninja
-    pkg-config
-    wrapGAppsHook4
-    buildPackages.glib
-    buildPackages.gtk4
-  ];
-
-  buildInputs = [
-    gcr_4
-    gdk-pixbuf
-    glib
-    glib-networking
-    gnome-desktop
-    gst_all_1.gst-libav
-    gst_all_1.gst-plugins-bad
-    gst_all_1.gst-plugins-base
-    gst_all_1.gst-plugins-good
-    gst_all_1.gst-plugins-ugly
-    gst_all_1.gstreamer
-    gtk4
-    icu
-    isocodes
-    json-glib
-    libadwaita
-    libportal-gtk4
-    libarchive
-    libsecret
-    libsoup_3
-    libxml2
-    nettle
-    p11-kit
-    sqlite
-    webkitgtk_6_0
-  ] ++ lib.optionals withPantheon [
-    pantheon.granite7
-  ];
-
-  # Tests need an X display
-  mesonFlags = [
-    "-Dunit_tests=disabled"
-  ] ++ lib.optionals withPantheon [
-    "-Dgranite=enabled"
-  ];
-
-  passthru = {
-    updateScript = gnome.updateScript {
-      packageName = "epiphany";
-    };
-  };
-
-  meta = with lib; {
-    homepage = "https://apps.gnome.org/Epiphany/";
-    description = "WebKit based web browser for GNOME";
-    mainProgram = "epiphany";
-    maintainers = teams.gnome.members ++ teams.pantheon.members;
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-  };
-})
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 3d152759c30d3..76f43497c4a07 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -24,8 +24,6 @@ in
 
   dconf-editor = callPackage ./core/dconf-editor { };
 
-  epiphany = callPackage ./core/epiphany { };
-
   gdm = callPackage ./core/gdm { };
 
   gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
@@ -225,6 +223,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.
   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.
   evince = lib.warn "The ‘gnome.evince’ was moved to top-level. Please use ‘pkgs.evince’ directly." pkgs.evince; # Added on 2024-06-13.
   evolution-data-server = lib.warn "The ‘gnome.evolution-data-server’ was moved to top-level. Please use ‘pkgs.evolution-data-server’ directly." pkgs.evolution-data-server; # Added on 2024-06-13.
   file-roller = lib.warn "The ‘gnome.file-roller’ was moved to top-level. Please use ‘pkgs.file-roller’ directly." pkgs.file-roller; # Added on 2024-06-13.