NixOS · Artturin · Mar 28, 2023 · jtojnar · Apr 3, 2023 · jtojnar
diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix
@@ -11,7 +11,7 @@
 , gobject-introspection
 , gtksourceview4
 , gspell
-, poppler_gi
+, poppler
 , webkitgtk
 , librsvg
 }:
@@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec {
   buildInputs = [
     gtksourceview4
     gspell
-    poppler_gi
+    poppler
     webkitgtk
     librsvg
   ];

diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix
@@ -12,7 +12,7 @@
 , meson
 , ninja
 , pkg-config
-, poppler_gi
+, poppler
 , wrapGAppsHook4
 }:
 
@@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication rec {
     gtk4
     libadwaita
     librsvg
-    poppler_gi
+    poppler
   ];
 
   propagatedBuildInputs = with python3.pkgs; [

diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix
@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication {
   buildInputs = with pkgs; [
     gtk3
     goocanvas2
-    poppler_gi
+    poppler
   ];
   propagatedBuildInputs = with python3.pkgs; [ pygobject3 pypdf2 ];
 

diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/applications/misc/pdfarranger/default.nix
@@ -1,6 +1,6 @@
 { fetchFromGitHub, lib
 , wrapGAppsHook, intltool
-, python3Packages, gtk3, poppler_gi
+, python3Packages, gtk3, poppler
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
   ]);
 
   buildInputs = [
-    gtk3 poppler_gi
+    gtk3 poppler
   ];
 
   propagatedBuildInputs = with python3Packages; [

diff --git a/pkgs/applications/office/paperwork/openpaperwork-gtk.nix b/pkgs/applications/office/paperwork/openpaperwork-gtk.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     pillow
     pygobject3
-    pkgs.poppler_gi
+    pkgs.poppler
     pkgs.gtk3
     pkgs.libhandy
     distro

diff --git a/pkgs/applications/office/paperwork/paperwork-backend.nix b/pkgs/applications/office/paperwork/paperwork-backend.nix
@@ -18,7 +18,7 @@
 , openpaperwork-gtk
 , psutil
 , gtk3
-, poppler_gi
+, poppler
 , gettext
 , which
 , shared-mime-info
@@ -64,7 +64,7 @@ buildPythonPackage rec {
     pyocr
     pypillowfight
     levenshtein
-    poppler_gi
+    poppler
     scikit-learn
     termcolor
     whoosh

diff --git a/pkgs/applications/office/pympress/default.nix b/pkgs/applications/office/pympress/default.nix
@@ -5,7 +5,7 @@
 , gtk3
 , gobject-introspection
 , libcanberra-gtk3
-, poppler_gi
+, poppler
 , withGstreamer ? stdenv.isLinux
 , withVLC ? stdenv.isLinux
  }:
@@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec {
 
   buildInputs = [
     gtk3
-    poppler_gi
+    poppler
   ] ++ lib.optional withGstreamer libcanberra-gtk3;
 
   propagatedBuildInputs = with python3Packages; [

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
@@ -22,9 +22,11 @@
 , scribus
 , texlive
 , zlib
+, gobject-introspection
+, buildPackages
 , withData ? true, poppler_data
 , qt5Support ? false, qt6Support ? false, qtbase ? null
-, introspectionSupport ? false, gobject-introspection ? null
+, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages && suffix == "glib"
 , utils ? false, nss ? null
 , minimal ? false
 , suffix ? "glib"
@@ -61,6 +63,8 @@ stdenv.mkDerivation (finalAttrs: rec {
     ninja
     pkg-config
     python3
+  ] ++ lib.optionals withIntrospection [
+    gobject-introspection
   ];
 
   buildInputs = [
@@ -86,7 +90,8 @@ stdenv.mkDerivation (finalAttrs: rec {
     nss
   ] ++ lib.optionals (qt5Support || qt6Support) [
     qtbase
-  ] ++ lib.optionals introspectionSupport [
+  ] ++ lib.optionals withIntrospection [
+    # TODO: REMOVE
     gobject-introspection
   ];
 

diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix
@@ -13,7 +13,7 @@
 , gdk-pixbuf
 , gobject-introspection
 , librsvg
-, poppler_gi
+, poppler
 , mutagen
 , pygobject3
 , pycairo
@@ -72,7 +72,7 @@ buildPythonPackage rec {
   buildInputs = [
     gdk-pixbuf
     librsvg
-    poppler_gi
+    poppler
   ];
 
   propagatedBuildInputs = [

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
@@ -1263,6 +1263,7 @@ mapAliases ({
   pond = throw "pond has been dropped due to the lack of maintanence from upstream since 2016"; # Added 2022-06-02
   poppler_qt5 = throw "'poppler_qt5' has been renamed to/replaced by 'libsForQt5.poppler'"; # Converted to throw 2022-02-22
   powerdns = pdns; # Added 2022-03-28
+  poppler_gi = poppler; # Added 2023-03-27
   portaudio2014 = throw "'portaudio2014' has been removed"; # Added 2022-05-10
 
   # postgresql

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -23089,10 +23089,6 @@ with pkgs;
 
   poppler = callPackage ../development/libraries/poppler { lcms = lcms2; };
 
-  poppler_gi = lowPrio (poppler.override {
-    introspectionSupport = true;
-  });
-
   poppler_min = poppler.override { # TODO: maybe reduce even more
     # this is currently only used by texlive.bin.
     minimal = true;

diff --git a/pkgs/top-level/pkg-config/pkg-config-data.json b/pkgs/top-level/pkg-config/pkg-config-data.json
@@ -760,7 +760,7 @@
     },
     "poppler-glib": {
       "attrPath": [
-        "poppler_gi"
+        "poppler"
       ]
     },
     "python": {