Skip to content

haskell-nix.extraPkgconfigMappings #1667

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Sep 14, 2022
Merged

haskell-nix.extraPkgconfigMappings #1667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/pkgconf-nixpkgs-map.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5583,7 +5583,7 @@ pkgs:
"zzipfseeko" = [ "zziplib" ];
"zziplib" = [ "zziplib" ];
"zzipmmapped" = [ "zziplib" ];
}) //
} // pkgs.haskell-nix.extraPkgconfigMappings) //
lookupAttrsIn pkgs.xorg {
# Adding xlibsWrapper since it was used here beofre.
# Putting libX11 first though so it can be used to get the version
Expand Down Expand Up @@ -5742,4 +5742,4 @@ pkgs:
else if pkgs ? gdk_pixbuf
then [ pkgs.gdk_pixbuf ]
else [];
}
}
2 changes: 2 additions & 0 deletions overlays/haskell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ final: prev: {
# overlays.
defaultModules = [];

# TODO: doc etc
extraPkgconfigMappings = {};
Copy link
Contributor Author

@ramirez7 ramirez7 Sep 13, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

I thought making this an attribute of haskell-nix and leveraging overlays would be the most composable route to propagating this to where it needed to go (similar to defaultModules).

Copy link
Contributor

Choose a reason for hiding this comment

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

This should probably be part of the project-common module.

# Nix Flake based source pins.
# To update all inputs, get unstable Nix and then `nix flake update --recreate-lock-file`
# Or `nix-shell -p nixUnstable --run "nix --experimental-features 'nix-command flakes' flake update --recreate-lock-file"`
Expand Down