diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index 5e48f85852df..ae715aa4321c 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -18,7 +18,7 @@ buildPythonApplication rec { ]; buildInputs = [ - gtk3 (librsvg.override { enableIntrospection = true; }) + gtk3 librsvg libnotify # Schemas with proxy configuration gnome3.gsettings-desktop-schemas diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 68bac54d653a..4ead21123498 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -28,8 +28,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales ]; buildInputs = with gnome3; [ gsettings-desktop-schemas gnome-keyring gnome-menus glib gcr json-glib accountsservice - libcroco libsecret pkgconfig libsoup polkit gdk_pixbuf - (librsvg.override { enableIntrospection = true; }) + libcroco libsecret pkgconfig libsoup polkit gdk_pixbuf librsvg clutter networkmanager libstartup_notification telepathy-glib libXtst p11-kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution-data-server libical nss gtk gstreamer gdm diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 31e9e06dacb5..4bb4db104382 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,9 +1,7 @@ { lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf , bzip2, libcroco, libintlOrEmpty, darwin, rust, gnome3 , withGTK ? false, gtk3 ? null -, gobjectIntrospection ? null, enableIntrospection ? false }: - -# no introspection by default, it's too big +, vala, gobjectIntrospection }: let pname = "librsvg"; @@ -21,17 +19,16 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintlOrEmpty ] - ++ stdenv.lib.optional enableIntrospection gobjectIntrospection; + buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintlOrEmpty ]; propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3; - nativeBuildInputs = [ pkgconfig rust.rustc rust.cargo ] + nativeBuildInputs = [ pkgconfig rust.rustc rust.cargo vala gobjectIntrospection ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); - configureFlags = [ "--enable-introspection=auto" ] + configureFlags = [ "--enable-introspection" "--enable-vala" ] ++ stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; NIX_CFLAGS_COMPILE diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35697cda9217..aa0fbae9ab12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20629,7 +20629,6 @@ with pkgs; sc-controller = pythonPackages.callPackage ../misc/drivers/sc-controller { inherit libusb1; # Shadow python.pkgs.libusb1. - librsvg = librsvg.override { enableIntrospection = true; }; }; sct = callPackage ../tools/X11/sct {};