treewide: remove issue #56943 workarounds

checked with diffoscope+difflog and launching the programs i have fixed that issue in my other gir PRs
2022-12-29 18:40:14 +02:00 · 2022-12-29 18:40:14 +02:00 · cadffcfe50
commit cadffcfe50
parent fa169bb239
47 changed files with 32 additions and 168 deletions
--- a/doc/languages-frameworks/gnome.section.md
+++ b/doc/languages-frameworks/gnome.section.md
@ -116,10 +116,6 @@ For convenience, it also adds `dconf.lib` for a GIO module implementing a GSetti

 - []{#ssec-gnome-hooks-gobject-introspection} `gobject-introspection` setup hook populates `GI_TYPELIB_PATH` variable with `lib/girepository-1.0` directories of dependencies, which is then added to wrapper by `wrapGAppsHook`. It also adds `share` directories of dependencies to `XDG_DATA_DIRS`, which is intended to promote GIR files but it also [pollutes the closures](https://github.com/NixOS/nixpkgs/issues/32790) of packages using `wrapGAppsHook`.

-  ::: {.warning}
-  The setup hook [currently](https://github.com/NixOS/nixpkgs/issues/56943) does not work in expressions with `strictDeps` enabled, like Python packages. In those cases, you will need to disable it with `strictDeps = false;`.
-  :::
-
 - []{#ssec-gnome-hooks-gst-grl-plugins} Setup hooks of `gst_all_1.gstreamer` and `grilo` will populate the `GST_PLUGIN_SYSTEM_PATH_1_0` and `GRL_PLUGIN_PATH` variables, respectively, which will then be added to the wrapper by `wrapGAppsHook`.

 You can also pass additional arguments to `makeWrapper` using `gappsWrapperArgs` in `preFixup` hook:
--- a/pkgs/applications/audio/blanket/default.nix
+++ b/pkgs/applications/audio/blanket/default.nix
@ -31,13 +31,13 @@ python3Packages.buildPythonApplication rec {
    pkg-config
    wrapGAppsHook4
    desktop-file-utils
+    gobject-introspection
  ];

  buildInputs = [
    glib
    gtk4
    libadwaita
-    gobject-introspection
    gst_all_1.gstreamer
    gst_all_1.gst-plugins-base
    gst_all_1.gst-plugins-good
@ -48,9 +48,6 @@ python3Packages.buildPythonApplication rec {
    pygobject3
  ];

-  # Broken with gobject-introspection setup hook
-  # https://github.com/NixOS/nixpkgs/issues/56943
-  strictDeps = false;
  format = "other";

  postPatch = ''
--- a/pkgs/applications/audio/cozy/default.nix
+++ b/pkgs/applications/audio/cozy/default.nix
@ -24,11 +24,6 @@ python3Packages.buildPythonApplication rec {
  pname = "cozy";
  version = "1.2.1";

-  # Temporary fix
-  # See https://github.com/NixOS/nixpkgs/issues/57029
-  # and https://github.com/NixOS/nixpkgs/issues/56943
-  strictDeps = false;
-
  src = fetchFromGitHub {
    owner = "geigi";
    repo = pname;
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@ -27,17 +27,12 @@ python3Packages.buildPythonApplication rec {
    intltool
    wrapGAppsHook
    glibcLocales
+    gobject-introspection
  ];

-  # as of 2021-07, the gobject-introspection setup hook does not
-  # work with `strictDeps` enabled, thus for proper `wrapGAppsHook`
-  # it needs to be disabled explicitly. https://github.com/NixOS/nixpkgs/issues/56943
-  strictDeps = false;
-
  buildInputs = [
    python3
    gtk3
-    gobject-introspection
    gnome.adwaita-icon-theme
  ];

--- a/pkgs/applications/audio/sonata/default.nix
+++ b/pkgs/applications/audio/sonata/default.nix
@ -39,10 +39,6 @@ in buildPythonApplication rec {
    setuptools
  ];

-  # Otherwise the setup hook for gobject-introspection is not run:
-  # https://github.com/NixOS/nixpkgs/issues/56943
-  strictDeps = false;
-
  postPatch = ''
    # Remove "Local MPD" tab which is not suitable for NixOS.
    sed -i '/localmpd/d' sonata/consts.py
--- a/pkgs/applications/audio/sublime-music/default.nix
+++ b/pkgs/applications/audio/sublime-music/default.nix
@ -75,10 +75,6 @@ python3Packages.buildPythonApplication rec {
  ++ lib.optional serverSupport bottle
  ;

-  # hook for gobject-introspection doesn't like strictDeps
-  # https://github.com/NixOS/nixpkgs/issues/56943
-  strictDeps = false;
-
  nativeCheckInputs = with python3Packages; [
    pytest
  ];
--- a/pkgs/applications/editors/rednotebook/default.nix
+++ b/pkgs/applications/editors/rednotebook/default.nix
@ -30,10 +30,6 @@ buildPythonApplication rec {
    "--suffix XDG_DATA_DIRS : $XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
  ];

-  # Until gobject-introspection in nativeBuildInputs is supported.
-  # https://github.com/NixOS/nixpkgs/issues/56943#issuecomment-472568643
-  strictDeps = false;
-
  meta = with lib; {
    homepage = "https://rednotebook.sourceforge.io/";
    changelog = "https://github.com/jendrikseipp/rednotebook/blob/v${version}/CHANGELOG.md";
--- a/pkgs/applications/graphics/curtail/default.nix
+++ b/pkgs/applications/graphics/curtail/default.nix
@ -37,18 +37,16 @@ python3.pkgs.buildPythonApplication rec {
    meson
    ninja
    pkg-config
+    gobject-introspection
  ];

  propagatedBuildInputs = [
    appstream-glib
    python3.pkgs.pygobject3
-    gobject-introspection
    gettext
+    gtk3
  ];

-  # Currently still required for the gobject-introspection setup hook
-  strictDeps = false;
-
  preInstall = ''
    patchShebangs ../build-aux/meson/postinstall.py
  '';
--- a/pkgs/applications/graphics/mcomix/default.nix
+++ b/pkgs/applications/graphics/mcomix/default.nix
@ -25,17 +25,13 @@ python3.pkgs.buildPythonApplication rec {
    hash = "sha256-Nok4oqTezO84q9IDZvgi33ZeKfRL+tpg7QEDmp2ZZpU=";
  };

-  buildInputs = [ gobject-introspection gtk3 gdk-pixbuf ];
-  nativeBuildInputs = [ wrapGAppsHook ];
+  buildInputs = [ gtk3 gdk-pixbuf ];
+  nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];
  propagatedBuildInputs = (with python3.pkgs; [ pillow pygobject3 pycairo ]);

  # Tests are broken
  doCheck = false;

-  # Correct wrapper behavior, see https://github.com/NixOS/nixpkgs/issues/56943
-  # until https://github.com/NixOS/nixpkgs/pull/102613
-  strictDeps = false;
-
  # prevent double wrapping
  dontWrapGApps = true;

--- a/pkgs/applications/graphics/pick-colour-picker/default.nix
+++ b/pkgs/applications/graphics/pick-colour-picker/default.nix
@ -37,10 +37,6 @@ buildPythonPackage rec {
    gtk3
  ];

-  # https://github.com/NixOS/nixpkgs/issues/56943
-  # this must be false, otherwise the gobject-introspection hook doesn't run
-  strictDeps = false;
-
  preDistPhases = [ "fixupIconPath" ];

  fixupIconPath = ''
--- a/pkgs/applications/misc/gnome-secrets/default.nix
+++ b/pkgs/applications/misc/gnome-secrets/default.nix
@ -18,7 +18,6 @@ python3Packages.buildPythonApplication rec {
  pname = "gnome-secrets";
  version = "7.2";
  format = "other";
-  strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943

  src = fetchFromGitLab {
    domain = "gitlab.gnome.org";
--- a/pkgs/applications/misc/hamster/default.nix
+++ b/pkgs/applications/misc/hamster/default.nix
@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, python3Packages, intltool, glib, itstool
+{ lib, fetchFromGitHub, python3Packages, intltool, glib, itstool, gtk3
 , wrapGAppsHook, gobject-introspection, pango, gdk-pixbuf, atk, wafHook }:

 python3Packages.buildPythonApplication rec {
@ -28,6 +28,7 @@ python3Packages.buildPythonApplication rec {
    pango
    gdk-pixbuf
    atk
+    gtk3
  ];

  propagatedBuildInputs = with python3Packages; [
@ -37,10 +38,6 @@ python3Packages.buildPythonApplication rec {
    dbus-python
  ];

-  # Setup hooks have trouble with strict deps.
-  # https://github.com/NixOS/nixpkgs/issues/56943
-  strictDeps = false;
-
  dontWrapGApps = true;

  # Arguments to be passed to `makeWrapper`, only used by buildPython*
--- a/pkgs/applications/misc/kupfer/default.nix
+++ b/pkgs/applications/misc/kupfer/default.nix
@ -11,6 +11,8 @@
 , shared-mime-info
 , wrapGAppsHook
 , wafHook
+, bash
+, dbus
 }:

 with python3Packages;
@ -33,14 +35,12 @@ buildPythonApplication rec {
    itstool            # for help pages
    desktop-file-utils # for update-desktop-database
    shared-mime-info   # for update-mime-info
+    docutils # for rst2man
+    dbus # for detection of dbus-send during build
  ];
-  buildInputs = [ docutils libwnck keybinder3 ];
+  buildInputs = [ libwnck keybinder3 bash ];
  propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ];

-  # without strictDeps kupfer fails to build: Could not find the python module 'gi.repository.Gtk'
-  # see https://github.com/NixOS/nixpkgs/issues/56943 for details
-  strictDeps = false;
-
  postInstall = ''
    gappsWrapperArgs+=(
      "--prefix" "PYTHONPATH" : "${makePythonPath propagatedBuildInputs}"
--- a/pkgs/applications/misc/lutris/default.nix
+++ b/pkgs/applications/misc/lutris/default.nix
@ -84,13 +84,12 @@ buildPythonApplication rec {
    sha256 = "sha256-rsiXm7L/M85ot6NrTyy//lMRFlLPJYve9y6Erg9Ugxg=";
  };

-  nativeBuildInputs = [ wrapGAppsHook ];
+  nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];
  buildInputs = [
    atk
    gdk-pixbuf
    glib-networking
    gnome-desktop
-    gobject-introspection
    gtk3
    libnotify
    pango
@ -139,9 +138,6 @@ buildPythonApplication rec {
    "--prefix PATH : ${lib.makeBinPath requiredTools}"
    "\${gappsWrapperArgs[@]}"
  ];
-  # needed for glib-schemas to work correctly (will crash on dialogues otherwise)
-  # see https://github.com/NixOS/nixpkgs/issues/56943
-  strictDeps = false;

  meta = with lib; {
    homepage = "https://lutris.net";
--- a/pkgs/applications/misc/minigalaxy/default.nix
+++ b/pkgs/applications/misc/minigalaxy/default.nix
@ -31,18 +31,14 @@ python3Packages.buildPythonApplication rec {
    runHook postCheck
  '';

-  # Cannot find GSettings schemas when opening settings,
-  # probably https://github.com/NixOS/nixpkgs/issues/56943
-  strictDeps = false;
-
  nativeBuildInputs = [
    gettext
    wrapGAppsHook
+    gobject-introspection
  ];

  buildInputs = [
    glib-networking
-    gobject-introspection
    gtk3
  ];

@ -64,6 +60,7 @@ python3Packages.buildPythonApplication rec {
  ];

  # Run Linux games using the Steam Runtime by using steam-run in the wrapper
+  # FIXME: not working with makeBinaryWrapper
  postFixup = ''
    sed -e 's#exec -a "$0"#exec -a "$0" ${steam-run}/bin/steam-run#' -i $out/bin/minigalaxy
  '';
--- a/pkgs/applications/misc/onboard/default.nix
+++ b/pkgs/applications/misc/onboard/default.nix
@ -108,9 +108,6 @@ python3.pkgs.buildPythonApplication rec {
    python3.pkgs.nose
  ];

-  # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
-  strictDeps = false;
-
  doCheck = false;

  preBuild = ''
--- a/pkgs/applications/misc/printrun/default.nix
+++ b/pkgs/applications/misc/printrun/default.nix
@ -32,8 +32,6 @@ python3Packages.buildPythonApplication rec {
  '';

  dontWrapGApps = true;
-  # https://github.com/NixOS/nixpkgs/issues/56943
-  strictDeps = false;

  preFixup = ''
    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
--- a/pkgs/applications/misc/wike/default.nix
+++ b/pkgs/applications/misc/wike/default.nix
@ -12,7 +12,6 @@ python3.pkgs.buildPythonApplication rec {
  pname = "wike";
  version = "1.7.1";
  format = "other";
-  strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943

  src = fetchFromGitHub {
    owner = "hugolabe";
--- a/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix
+++ b/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix
@ -66,9 +66,6 @@ python3.pkgs.buildPythonApplication rec {
    requests
  ];

-  # https://github.com/NixOS/nixpkgs/issues/56943
-  strictDeps = false;
-
  dontWrapGApps = true;

  preFixup = ''
--- a/pkgs/applications/networking/giara/default.nix
+++ b/pkgs/applications/networking/giara/default.nix
@ -64,9 +64,6 @@ python3.pkgs.buildPythonApplication rec {
      --replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
  '';

-  # Fix setup-hooks https://github.com/NixOS/nixpkgs/issues/56943
-  strictDeps = false;
-
  meta = with lib; {
    description = "A Reddit app, built with Python, GTK and Handy; Created with mobile Linux in mind";
    maintainers = with maintainers; [ dasj19 ];
--- a/pkgs/applications/networking/mailreaders/bubblemail/default.nix
+++ b/pkgs/applications/networking/mailreaders/bubblemail/default.nix
@ -13,6 +13,7 @@
 , glib
 , gobject-introspection
 , folks
+, bash
 }:

 python3Packages.buildPythonApplication rec {
@ -39,6 +40,7 @@ python3Packages.buildPythonApplication rec {
    libsecret
    gnome-online-accounts
    folks
+    bash
  ];

  nativeBuildInputs = [
@ -59,9 +61,6 @@ python3Packages.buildPythonApplication rec {
  # See https://nixos.org/nixpkgs/manual/#ssec-gnome-common-issues-double-wrapped
  dontWrapGApps = true;

-  # https://github.com/NixOS/nixpkgs/issues/56943
-  strictDeps = false;
-
  preFixup = ''
    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
  '';
--- a/pkgs/applications/networking/protonvpn-gui/default.nix
+++ b/pkgs/applications/networking/protonvpn-gui/default.nix
@ -41,8 +41,6 @@ buildPythonApplication rec {
  ];

  buildInputs = [
-    # To avoid enabling strictDeps = false (#56943)
-    gobject-introspection
    librsvg
    pango
    webkitgtk
--- a/pkgs/applications/office/gtg/default.nix
+++ b/pkgs/applications/office/gtg/default.nix
@ -67,7 +67,6 @@ python3Packages.buildPythonApplication rec {
  '';

  format = "other";
-  strictDeps = false; # gobject-introspection does not run with strictDeps (https://github.com/NixOS/nixpkgs/issues/56943)

  checkPhase = "xvfb-run pytest ../tests/";

--- a/pkgs/applications/office/zim/default.nix
+++ b/pkgs/applications/office/zim/default.nix
@ -14,9 +14,8 @@ python3Packages.buildPythonApplication rec {
    sha256 = "sha256-iOF11/fhQYlvnpWJidJS1yJVavF7xLxvBl59VCh9A4U=";
  };

-  buildInputs = [ gtk3 gobject-introspection gnome.adwaita-icon-theme ];
+  buildInputs = [ gtk3 gnome.adwaita-icon-theme ];
  propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ];
-  # see https://github.com/NixOS/nixpkgs/issues/56943#issuecomment-1131643663
  nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];

  dontWrapGApps = true;
--- a/pkgs/applications/science/misc/bada-bib/default.nix
+++ b/pkgs/applications/science/misc/bada-bib/default.nix
@ -22,7 +22,6 @@ python3Packages.buildPythonApplication rec {
  pname = "bada-bib";
  version = "0.8.0";
  format = "other";
-  strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943

  src = fetchFromGitHub {
    owner = "RogerCrocker";
--- a/pkgs/applications/terminal-emulators/guake/default.nix
+++ b/pkgs/applications/terminal-emulators/guake/default.nix
@ -26,11 +26,6 @@ python3.pkgs.buildPythonApplication rec {
    sha256 = "sha256-BW13fBH26UqMPMjV8JC4QkpgzyoPfCpAfSkJD68uOZU=";
  };

-  # Strict deps breaks guake
-  # See https://github.com/NixOS/nixpkgs/issues/59930
-  # and https://github.com/NixOS/nixpkgs/issues/56943
-  strictDeps = false;
-
  nativeBuildInputs = [
    gobject-introspection
    wrapGAppsHook
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@ -52,10 +52,6 @@ python3.pkgs.buildPythonApplication rec {
    pycairo
  ];

-  # gobject-introspection and some other similar setup hooks do not currently work with strictDeps.
-  # https://github.com/NixOS/nixpkgs/issues/56943
-  strictDeps = false;
-
  postPatch = ''
    patchShebangs meson_shebang_normalisation.py
  '';
--- a/pkgs/applications/video/devede/default.nix
+++ b/pkgs/applications/video/devede/default.nix
@ -15,17 +15,8 @@ in buildPythonApplication rec {
    sha256 = "1xb7acjphvn4ya8fgjsvag5gzi9a6c2famfl0ffr8nhb9y8ig9mg";
  };

-  # Temporary fix
-  # See https://github.com/NixOS/nixpkgs/issues/61578
-  # and https://github.com/NixOS/nixpkgs/issues/56943
-  strictDeps = false;
-
  nativeBuildInputs = [
    gettext wrapGAppsHook
-
-    # Temporary fix
-    # See https://github.com/NixOS/nixpkgs/issues/61578
-    # and https://github.com/NixOS/nixpkgs/issues/56943
    gobject-introspection
  ];

--- a/pkgs/applications/video/kazam/default.nix
+++ b/pkgs/applications/video/kazam/default.nix
@ -40,9 +40,6 @@ python3Packages.buildPythonApplication rec {

  propagatedBuildInputs = with python3Packages; [ pygobject3 pyxdg pycairo dbus-python xlib ];

-  # workaround https://github.com/NixOS/nixpkgs/issues/56943
-  strictDeps = false;
-
  patches = [
    # Fix paths
    (substituteAll {
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@ -44,10 +44,10 @@ python3.pkgs.buildPythonApplication rec {
    itstool
    python3
    wrapGAppsHook
+    gobject-introspection
  ];

  buildInputs = [
-    gobject-introspection
    gtk3
    libpeas
    librsvg
@ -78,12 +78,6 @@ python3.pkgs.buildPythonApplication rec {
    patchShebangs ./getenvvar.py
  '';

-  # Fixes error
-  #     Couldn’t recognize the image file format for file ".../share/pitivi/pixmaps/asset-proxied.svg"
-  # at startup, see https://github.com/NixOS/nixpkgs/issues/56943
-  # and https://github.com/NixOS/nixpkgs/issues/89691#issuecomment-714398705.
-  strictDeps = false;
-
  passthru = {
    updateScript = gnome.updateScript {
      packageName = "pitivi";
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@ -26,7 +26,6 @@ python3.pkgs.buildPythonApplication rec {
    wrapGAppsHook
    libvirt-glib vte dconf gtk-vnc gnome.adwaita-icon-theme avahi
    gsettings-desktop-schemas libosinfo gtksourceview4
-    gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
  ] ++ lib.optional spiceSupport spice-gtk;

  propagatedBuildInputs = with python3.pkgs; [
--- a/pkgs/desktops/gnome/apps/accerciser/default.nix
+++ b/pkgs/desktops/gnome/apps/accerciser/default.nix
@ -13,6 +13,7 @@
 , gettext
 , libwnck
 , adwaita-icon-theme
+, librsvg
 }:

 python3.pkgs.buildPythonApplication rec {
@ -41,6 +42,7 @@ python3.pkgs.buildPythonApplication rec {
    at-spi2-core
    gtk3
    libwnck
+    librsvg
  ];

  propagatedBuildInputs = with python3.pkgs; [
@ -52,10 +54,6 @@ python3.pkgs.buildPythonApplication rec {
    xlib
  ];

-  # Strict deps breaks accerciser
-  # and https://github.com/NixOS/nixpkgs/issues/56943
-  strictDeps = false;
-
  passthru = {
    updateScript = gnome.updateScript {
      packageName = "accerciser";
--- a/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix
+++ b/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix
@ -22,7 +22,6 @@ python3Packages.buildPythonApplication rec {
  pname = "gnome-tweaks";
  version = "42.beta";
  format = "other";
-  strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
--- a/pkgs/desktops/xfce/applications/catfish/default.nix
+++ b/pkgs/desktops/xfce/applications/catfish/default.nix
@ -41,7 +41,6 @@ python3Packages.buildPythonApplication rec {
    python3Packages.pyxdg
    python3Packages.ptyprocess
    python3Packages.pycairo
-    gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
  ];

  propagatedBuildInputs = [
--- a/pkgs/development/tools/cambalache/default.nix
+++ b/pkgs/development/tools/cambalache/default.nix
@ -57,15 +57,16 @@ python3.pkgs.buildPythonApplication rec {
    libhandy
  ];

-  # Not compatible with gobject-introspection setup hooks.
-  # https://github.com/NixOS/nixpkgs/issues/56943
-  strictDeps = false;
-
  # Prevent double wrapping.
  dontWrapGApps = true;

  postPatch = ''
    patchShebangs postinstall.py
+    # those programs are used at runtime not build time
+    # https://gitlab.gnome.org/jpu/cambalache/-/blob/main/meson.build#L79-80
+    substituteInPlace ./meson.build \
+      --replace "find_program('broadwayd', required: true)" "" \
+      --replace "find_program('gtk4-broadwayd', required: true)" ""
  '';

  preFixup = ''
--- a/pkgs/development/tools/misc/d-feet/default.nix
+++ b/pkgs/development/tools/misc/d-feet/default.nix
@ -63,10 +63,6 @@ python3.pkgs.buildPythonApplication rec {
    "-Dtests=false" # needs dbus
  ];

-  # Temporary fix
-  # See https://github.com/NixOS/nixpkgs/issues/56943
-  strictDeps = false;
-
  postPatch = ''
    chmod +x meson_post_install.py
    patchShebangs meson_post_install.py
--- a/pkgs/misc/drivers/sc-controller/default.nix
+++ b/pkgs/misc/drivers/sc-controller/default.nix
@ -18,12 +18,9 @@ buildPythonApplication rec {
    sha256 = "sha256-ym5fkOTRhibBaUqT0+p/jyqqKOVsyMz5INgfkoz0IJA=";
  };

-  # see https://github.com/NixOS/nixpkgs/issues/56943
-  strictDeps = false;
+  nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];

-  nativeBuildInputs = [ wrapGAppsHook ];
-
-  buildInputs = [ gtk3 gobject-introspection libappindicator-gtk3 librsvg ];
+  buildInputs = [ gtk3 libappindicator-gtk3 librsvg ];

  propagatedBuildInputs = [ evdev pygobject3 pylibacl vdf ];

--- a/pkgs/misc/solfege/default.nix
+++ b/pkgs/misc/solfege/default.nix
@ -35,13 +35,11 @@ buildPythonApplication rec {
    texinfo
    txt2man

-    # https://github.com/NixOS/nixpkgs/issues/56943#issuecomment-1131643663
    gobject-introspection
    wrapGAppsHook
  ];

  buildInputs = [
-    gobject-introspection
    gtk3
    librsvg
  ];
--- a/pkgs/os-specific/linux/piper/default.nix
+++ b/pkgs/os-specific/linux/piper/default.nix
@ -19,9 +19,7 @@ python3.pkgs.buildPythonApplication rec {
  buildInputs = [
    gtk3 glib gnome.adwaita-icon-theme python3 librsvg
  ];
-  propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ] ++ [
-    gobject-introspection # fixes https://github.com/NixOS/nixpkgs/issues/56943 for now
-  ];
+  propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ];

  mesonFlags = [
    "-Druntime-dependency-checks=false"
--- a/pkgs/tools/X11/arandr/default.nix
+++ b/pkgs/tools/X11/arandr/default.nix
@ -27,10 +27,6 @@ buildPythonApplication rec {
  # no tests
  doCheck = false;

-  # hook for gobject-introspection doesn't like strictDeps
-  # https://github.com/NixOS/nixpkgs/issues/56943
-  strictDeps = false;
-
  buildInputs = [ docutils gsettings-desktop-schemas gtk3 ];
  nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];
  propagatedBuildInputs = [ xrandr pygobject3 ];
--- a/pkgs/tools/audio/beets/common.nix
+++ b/pkgs/tools/audio/beets/common.nix
@ -61,7 +61,6 @@ python3Packages.buildPythonApplication rec {

  propagatedBuildInputs = with python3Packages; [
    confuse
-    gobject-introspection
    gst-python
    jellyfish
    mediafile
@ -74,7 +73,6 @@ python3Packages.buildPythonApplication rec {
    unidecode
  ] ++ (concatMap (p: p.propagatedBuildInputs) (attrValues enabledPlugins));

-  # see: https://github.com/NixOS/nixpkgs/issues/56943#issuecomment-1131643663
  nativeBuildInputs = [
    gobject-introspection
    sphinxHook
--- a/pkgs/tools/audio/mpdris2/default.nix
+++ b/pkgs/tools/audio/mpdris2/default.nix
@ -13,7 +13,6 @@ python3.pkgs.buildPythonApplication rec {
  pname = "mpDris2";
  version = "0.9.1";
  format = "other";
-  strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943

  src = fetchFromGitHub {
    owner = "eonpatapon";
--- a/pkgs/tools/inputmethods/input-remapper/default.nix
+++ b/pkgs/tools/inputmethods/input-remapper/default.nix
@ -45,11 +45,6 @@ in
    hash = "sha256-KPQLgXSonuOgphagYN2JN+CMIpmjTIPUTCqOPDk0UYU=";
  };

-  # Fixes error
-  # Couldn’t recognize the image file format for file "*.svg"
-  # at startup, see https://github.com/NixOS/nixpkgs/issues/56943
-  strictDeps = false;
-
  postPatch = ''
    # fix FHS paths
    substituteInPlace inputremapper/configs/data.py \
--- a/pkgs/tools/misc/gaphor/default.nix
+++ b/pkgs/tools/misc/gaphor/default.nix
@ -37,11 +37,7 @@ buildPythonApplication rec {
    wrapGAppsHook
  ];

-  # Setting gobject-introspection on booth nativeBuildInputs and
-  # buildInputs because of #56943. This recognizes pango, avoiding
-  # a "ValueError: Namespace PangoCairo not available".
  buildInputs = [
-    gobject-introspection
    gtksourceview4
    pango
  ];
--- a/pkgs/tools/misc/trackma/default.nix
+++ b/pkgs/tools/misc/trackma/default.nix
@ -35,10 +35,10 @@ python3.pkgs.buildPythonApplication rec {
  };

  nativeBuildInputs = [ copyDesktopItems ]
-    ++ lib.optionals withGTK [ wrapGAppsHook ]
+    ++ lib.optionals withGTK [ wrapGAppsHook gobject-introspection ]
    ++ lib.optionals withQT [ qt5.wrapQtAppsHook ];

-  buildInputs = lib.optionals withGTK [ glib gobject-introspection gtk3 ];
+  buildInputs = lib.optionals withGTK [ glib gtk3 ];

  propagatedBuildInputs = with python3.pkgs; ([ urllib3 ]
    ++ lib.optionals withQT [ pyqt5 ]
@ -47,9 +47,6 @@ python3.pkgs.buildPythonApplication rec {
    ++ lib.optionals stdenv.isLinux [ dbus-python pygobject3 pyinotify ]
    ++ lib.optionals (withGTK || withQT) [ pillow ]);

-  # broken with gobject-introspection setup hook, see https://github.com/NixOS/nixpkgs/issues/56943
-  strictDeps = false;
-
  dontWrapQtApps = true;
  dontWrapGApps = true;

--- a/pkgs/tools/security/gnome-keysign/default.nix
+++ b/pkgs/tools/security/gnome-keysign/default.nix
@ -67,9 +67,6 @@ python3.pkgs.buildPythonApplication rec {
    twisted
  ];

-  # https://github.com/NixOS/nixpkgs/issues/56943
-  strictDeps = false;
-
  # bunch of linting
  doCheck = false;

--- a/pkgs/tools/security/xsser/default.nix
+++ b/pkgs/tools/security/xsser/default.nix
@ -22,10 +22,6 @@ buildPythonApplication rec {
    substituteInPlace setup.py --replace /usr/share share
  '';

-  # Temporary fix
-  # See https://github.com/NixOS/nixpkgs/issues/56943
-  strictDeps = false;
-
  nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];

  buildInputs = [