Skip to content

vcpkg: make builtin-baseline work #328937

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

Closed
Jayman2000 wants to merge 1 commit into from
Closed

vcpkg: make builtin-baseline work #328937

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: 18 additions & 4 deletions pkgs/by-name/vc/vcpkg/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ fetchFromGitHub
, stdenvNoCC
, lib
, git
, vcpkg-tool
, makeWrapper
, doWrap ? true
Expand All @@ -14,7 +15,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
owner = "microsoft";
repo = "vcpkg";
rev = finalAttrs.version;
hash = "sha256-eDpMGDtC44eh0elLWV0r1H/WbpVdZ5qMedKh7Ct50Cs=";
hash = "sha256-omHlViym0hs02cn/25nUVtNVa38yowByttZ2vjqpWhs=";
# If you use a builtin-baseline in a vcpkg.json file, then vcpkg will try
# to run “git show <baseline-commit>”. We need a deep clone in order to
# ensure that that works.
deepClone = true;
};

nativeBuildInputs = [ makeWrapper ];
Expand All @@ -32,12 +37,21 @@ stdenvNoCC.mkDerivation (finalAttrs: {
installPhase = ''
runHook preInstall

mkdir -p "$out/bin" "$out/share/vcpkg/scripts/buildsystems"
cp --preserve=mode -r ./{docs,ports,triplets,scripts,.vcpkg-root,versions,LICENSE.txt} "$out/share/vcpkg/"
mkdir -p "$out/bin" "$out/libexec/vcpkg" "$out/share/vcpkg/scripts/buildsystems"
cp --preserve=mode -r ./{.git,docs,ports,triplets,scripts,.vcpkg-root,versions,LICENSE.txt} "$out/share/vcpkg/"

${lib.optionalString doWrap ''
# If you use a builtin-baseline in a vcpkg.json file, then vcpkg will
# try to run “git show” on $out/share/vcpkg. By default, Git will fail
# if a Git repo isn’t owned by the current user. We create a wrapper
# for git here to make sure that the “git show” command succeeds, even
# if the user running vcpkg doesn’t own $out/share/vcpkg.
makeWrapper "${git}/bin/git" "$out/libexec/vcpkg/git" \
--add-flags -c --add-flags safe.directory="$out/share/vcpkg"

makeWrapper "${vcpkg-tool}/bin/vcpkg" "$out/bin/vcpkg" \
--set-default VCPKG_ROOT "$out/share/vcpkg"
--set-default VCPKG_ROOT "$out/share/vcpkg" \
--prefix PATH : "$out/libexec/git"
Comment thread
Jayman2000 marked this conversation as resolved.
''}

ln -s "$out/bin/vcpkg" "$out/share/vcpkg/vcpkg"
Expand Down