Skip to content

fix targetPrefix in cabal-pkg-config #1838

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
Feb 8, 2023
Merged

fix targetPrefix in cabal-pkg-config #1838

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
22 changes: 14 additions & 8 deletions overlays/cabal-pkg-config.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,26 +81,32 @@ final: prev:
#
# See https://github.com/input-output-hk/haskell.nix/issues/1642
#
cabalPkgConfigWrapper = prev.pkgconfig.overrideAttrs (attrs: {
cabalPkgConfigWrapper = prev.pkgconfig.overrideAttrs (attrs: (
let
# These vars moved from attrs to attrs.env in nixpkgs adc8900df1758eda56abd68f7d781d1df74fa531
# Support both for the time being.
targetPrefix = attrs.targetPrefix or attrs.env.targetPrefix;
baseBinName = attrs.baseBinName or attrs.env.baseBinName;
in {
installPhase = attrs.installPhase + ''
mv $out/bin/${attrs.targetPrefix}${attrs.baseBinName} \
$out/bin/${attrs.targetPrefix}${attrs.baseBinName}-wrapped
mv $out/bin/${targetPrefix}${baseBinName} \
$out/bin/${targetPrefix}${baseBinName}-wrapped

cat <<EOF >$out/bin/${attrs.targetPrefix}${attrs.baseBinName}
cat <<EOF >$out/bin/${targetPrefix}${baseBinName}
#!${final.stdenv.shell}
if [[ "\$1" == "--libs" && "\$2" == "--static" ]]; then
OUTPUT=\$(mktemp)
ERROR=\$(mktemp)
if $out/bin/${attrs.targetPrefix}${attrs.baseBinName}-wrapped "\$@" >output 2>\$ERROR; then
if $out/bin/${targetPrefix}${baseBinName}-wrapped "\$@" >output 2>\$ERROR; then
cat \$OUTPUT
else
echo "--error-pkg-config-static-failed=\$ERROR"
fi
else
$out/bin/${attrs.targetPrefix}${attrs.baseBinName}-wrapped "\$@"
$out/bin/${targetPrefix}${baseBinName}-wrapped "\$@"
fi
EOF
chmod +x $out/bin/${attrs.targetPrefix}${attrs.baseBinName}
chmod +x $out/bin/${targetPrefix}${baseBinName}
'';
});
}));
}