diff --git a/pkgs/by-name/ve/verifast/package.nix b/pkgs/by-name/ve/verifast/package.nix index 6239c16dd2b8a..075ca13b8a9d6 100644 --- a/pkgs/by-name/ve/verifast/package.nix +++ b/pkgs/by-name/ve/verifast/package.nix @@ -11,7 +11,6 @@ freetype, fontconfig, libxml2, - gnome2, }: let @@ -29,7 +28,6 @@ let freetype fontconfig libxml2 - gnome2.gtksourceview ] + ":${lib.getLib stdenv.cc.cc}/lib64:$out/libexec"; diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 44aee4313b747..cab2edaf716dc 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -8,8 +8,6 @@ lib.makeScope pkgs.newScope ( self: with self; { - #### PLATFORM - libIDL = callPackage ./platform/libIDL { gettext = if stdenv.hostPlatform.isDarwin then pkgs.gettext else null; }; @@ -31,10 +29,6 @@ lib.makeScope pkgs.newScope ( gtkglext = callPackage ./platform/gtkglext { }; - #### DESKTOP - - gtksourceview = callPackage ./desktop/gtksourceview { }; - } ) // lib.optionalAttrs config.allowAliases { @@ -56,6 +50,7 @@ lib.makeScope pkgs.newScope ( gtk = throw "gnome2.gtk has been removed, please use top-level gtk2"; gtkmm = throw "gnome2.gtkmm has been removed, please use top-level gtkmm2"; gtkdoc = throw "gnome2.gtkdoc has been removed, please use top-level gtk-doc"; + gtksourceview = throw "gnome2.gtksourceview has been removed, please use top-level gtksourceview"; startup_notification = throw "gnome2.startup_notification has been removed, please use top-level libstartup_notification"; startupnotification = throw "gnome2.startupnotification has been removed, please use top-level libstartup_notification"; gnomedocutils = throw "gnome2.gnomedocutils has been removed, please use top-level gnome-doc-utils"; diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix deleted file mode 100644 index f7035701133f3..0000000000000 --- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ - lib, - stdenv, - fetchpatch, - fetchurl, - autoreconfHook, - gtk-doc, - pkg-config, - atk, - cairo, - glib, - gnome-common, - gtk2, - pango, - libxml2Python, - perl, - intltool, - gettext, - gtk-mac-integration-gtk2, - testers, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "gtksourceview"; - version = "2.10.5"; - - src = - let - inherit (finalAttrs) pname version; - in - fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e"; - }; - - patches = lib.optionals stdenv.hostPlatform.isDarwin [ - (fetchpatch { - name = "change-igemacintegration-to-gtkosxapplication.patch"; - url = "https://gitlab.gnome.org/GNOME/gtksourceview/commit/e88357c5f210a8796104505c090fb6a04c213902.patch"; - sha256 = "0h5q79q9dqbg46zcyay71xn1pm4aji925gjd5j93v4wqn41wj5m7"; - }) - (fetchpatch { - name = "update-to-gtk-mac-integration-2.0-api.patch"; - url = "https://gitlab.gnome.org/GNOME/gtksourceview/commit/ab46e552e1d0dae73f72adac8d578e40bdadaf95.patch"; - sha256 = "0qzrbv4hpa0v8qbmpi2vp575n13lkrvp3cgllwrd2pslw1v9q3aj"; - }) - ]; - - # Fix build with gcc 14 - env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; - - nativeBuildInputs = [ - pkg-config - intltool - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - autoreconfHook - gtk-doc - ]; - - buildInputs = [ - atk - cairo - glib - gtk2 - pango - libxml2Python - perl - gettext - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - gnome-common - gtk-mac-integration-gtk2 - ]; - - doCheck = false; # requires X11 daemon - - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - - meta = { - pkgConfigModules = [ "gtksourceview-2.0" ]; - }; -}) diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index ff29dfed72683..580112927bdd7 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -9,7 +9,6 @@ pkg-config, gtk2, libgnomecanvas, - gtksourceview, camlp-streams, }: @@ -67,7 +66,6 @@ stdenv.mkDerivation { buildInputs = [ gtk2 libgnomecanvas - gtksourceview ] ++ param.buildInputs or [ ]; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 9e4950454a7ed..b31afb7641b48 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1052,7 +1052,7 @@ let lablgl = callPackage ../development/ocaml-modules/lablgl { }; lablgtk = callPackage ../development/ocaml-modules/lablgtk { - inherit (pkgs.gnome2) libgnomecanvas gtksourceview; + inherit (pkgs.gnome2) libgnomecanvas; }; lablgtk-extras =