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

Add libNixName for graphene-gobject #609

Merged
merged 1 commit into from
Nov 2, 2023
Merged

Conversation

cdepillabout
Copy link
Member

This is part of the fix for NixOS/nixpkgs#262103

@cdepillabout
Copy link
Member Author

Without this fix, hackage2nix generates the derivation for gi-graphene as:

"gi-graphene" = callPackage
  ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
   , gi-gobject, graphene-gobject, haskell-gi, haskell-gi-base
   , haskell-gi-overloading, text, transformers
   }:
   mkDerivation {
     pname = "gi-graphene";
     version = "1.0.7";
     sha256 = "1slpywv49m815qk78cz5lfpwym2dvi6qrmij4j61sb3xk034k33s";
     setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ];
     libraryHaskellDepends = [
       base bytestring containers gi-glib gi-gobject haskell-gi
       haskell-gi-base haskell-gi-overloading text transformers
     ];
     libraryPkgconfigDepends = [ graphene-gobject ];
     description = "Graphene bindings";
     license = lib.licenses.lgpl21Only;
     hydraPlatforms = lib.platforms.none;
     broken = true;
   }) {graphene-gobject = null;};

With this PR, gi-graphene is generated as:

"gi-graphene" = callPackage
  ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
   , gi-gobject, graphene, haskell-gi, haskell-gi-base
   , haskell-gi-overloading, text, transformers
   }:
   mkDerivation {
     pname = "gi-graphene";
     version = "1.0.7";
     sha256 = "1slpywv49m815qk78cz5lfpwym2dvi6qrmij4j61sb3xk034k33s";
     setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ];
     libraryHaskellDepends = [
       base bytestring containers gi-glib gi-gobject haskell-gi
       haskell-gi-base haskell-gi-overloading text transformers
     ];
     libraryPkgconfigDepends = [ graphene ];
     description = "Graphene bindings";
     license = lib.licenses.lgpl21Only;
     hydraPlatforms = lib.platforms.none;
     broken = true;
   }) {inherit (pkgs) graphene;};

You can see that the graphene-gobject pkgconfig depend is now pulled correctly from the Nixpkgs top-level graphene package.

@cdepillabout
Copy link
Member Author

CI is failing on ghc-9.4, but it doesn't look related to this PR.

@maralorn maralorn merged commit 2099a1f into NixOS:master Nov 2, 2023
4 of 5 checks passed
@maralorn
Copy link
Member

maralorn commented Nov 2, 2023

thx!

@cdepillabout cdepillabout deleted the graphene branch November 2, 2023 13:48
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