Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support gtk4 and gtksourceview5 pc files #640

Merged
merged 2 commits into from
Jan 17, 2025
Merged

Conversation

sternenseemann
Copy link
Member

@sternenseemann sternenseemann commented Jan 17, 2025

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 0e81500ac571..a71f567128d9 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -122770,7 +122770,7 @@ self: {
 
   "gi-gdkx114" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
-     , gi-gdk4, gi-gio, gi-gobject, gi-xlib, gtk4-x11, haskell-gi
+     , gi-gdk4, gi-gio, gi-gobject, gi-xlib, gtk4, haskell-gi
      , haskell-gi-base, haskell-gi-overloading, text, transformers
      }:
      mkDerivation {
@@ -122785,10 +122785,10 @@ self: {
          gi-xlib haskell-gi haskell-gi-base haskell-gi-overloading text
          transformers
        ];
-       libraryPkgconfigDepends = [ gtk4-x11 ];
+       libraryPkgconfigDepends = [ gtk4 ];
        description = "GdkX11 4.x bindings";
        license = lib.licenses.lgpl21Only;
-     }) {gtk4-x11 = null;};
+     }) {inherit (pkgs) gtk4;};
 
   "gi-ges" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
@@ -123430,7 +123430,7 @@ self: {
   "gi-gtksource5" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk4, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
-     , gi-gtk4, gi-pango, gtksourceview, haskell-gi, haskell-gi-base
+     , gi-gtk4, gi-pango, gtksourceview5, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
      }:
      mkDerivation {
@@ -123446,10 +123446,10 @@ self: {
          gi-gio gi-glib gi-gobject gi-gtk4 gi-pango haskell-gi
          haskell-gi-base haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ gtksourceview ];
+       libraryPkgconfigDepends = [ gtksourceview5 ];
        description = "GtkSource 5.x bindings";
        license = lib.licenses.lgpl21Only;
-     }) {inherit (pkgs) gtksourceview;};
+     }) {inherit (pkgs) gtksourceview5;};
 
   "gi-handy" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk

Copy link
Member

@cdepillabout cdepillabout left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@sternenseemann sternenseemann merged commit f83c66e into master Jan 17, 2025
7 checks passed
@sternenseemann sternenseemann deleted the gtk-libnames branch January 17, 2025 15:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants