gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vcpkg: 2025.10.17 -> 2026.01.16 (#493132)

Browse Source
This commit is contained in:
Colin
2026-03-27 19:47:13 +00:00
committed by GitHub
parent 7b3f085fb0 2b2e879408
commit f57b9102e2
3 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/vc/vcpkg-tool/change-lock-location.patch
+6 -6
View File
@@ -1,14 +1,14 @@
diff --git a/src/vcpkg/vcpkgpaths.cpp b/src/vcpkg/vcpkgpaths.cpp
index 3f588c21..e6f2bbed 100644
index bb07a8fe..7dcf9c9b 100644
--- a/src/vcpkg/vcpkgpaths.cpp
+++ b/src/vcpkg/vcpkgpaths.cpp
@@ -579,7 +579,8 @@ namespace vcpkg
if (!args.do_not_take_lock)
{
std::error_code ec;
@@ -607,7 +607,8 @@ namespace vcpkg
lock_taking_context = &wdc;
}
- const auto vcpkg_root_file = root / ".vcpkg-root";
+ fs.create_directories(Path{"/tmp/vcpkg"}, VCPKG_LINE_INFO);
+ const auto vcpkg_root_file = Path{"/tmp/vcpkg"} / Hash::get_string_sha256(root.c_str());
if (args.wait_for_lock.value_or(false))
{
file_lock_handle = fs.take_exclusive_file_lock(vcpkg_root_file, ec);
file_lock_handle = fs.take_exclusive_file_lock(*lock_taking_context, vcpkg_root_file);
pkgs/by-name/vc/vcpkg-tool/package.nix
+2 -2
View File
@@ -24,13 +24,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "vcpkg-tool";
version = "2025-12-05";
version = "2025-12-16";
src = fetchFromGitHub {
owner = "microsoft";
repo = "vcpkg-tool";
rev = finalAttrs.version;
hash = "sha256-Sl9xs4WkydcRd5NGFGEoQEx2o+g+KAGn4UPtQ1dPpoY=";
hash = "sha256-EnKfeWRiqWVFbGc2QNT9YQHs+dlXvvri9FPVxpxpphM=";
};
nativeBuildInputs = [
pkgs/by-name/vc/vcpkg/package.nix
+4 -8
View File
@@ -9,13 +9,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "vcpkg";
version = "2025.10.17";
version = "2026.01.16";
src = fetchFromGitHub {
owner = "microsoft";
repo = "vcpkg";
tag = finalAttrs.version;
hash = "sha256-prWpMtvXWZ53y2gzr7IIqL/5kQZRfErnynEHMqi15/A=";
hash = "sha256-fT1EADy3wXm1JIpAbOmS2LWCJCK/kbsiaN9ILgQuZek=";
leaveDotGit = true;
postFetch = ''
cd "$out"
@@ -39,12 +39,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
postPatch = ''
substituteInPlace scripts/toolchains/linux.cmake \
--replace-fail "aarch64-linux-gnu-as" "aarch64-unknown-linux-gnu-as" \
--replace-fail "aarch64-linux-gnu-gcc" "aarch64-unknown-linux-gnu-gcc" \
--replace-fail "aarch64-linux-gnu-g++" "aarch64-unknown-linux-gnu-g++" \
--replace-fail "arm-linux-gnueabihf-as" "armv7l-unknown-linux-gnueabihf-as" \
--replace-fail "arm-linux-gnueabihf-gcc" "armv7l-unknown-linux-gnueabihf-gcc" \
--replace-fail "arm-linux-gnueabihf-g++" "armv7l-unknown-linux-gnueabihf-g++"
--replace-fail "\''${CMAKE_SYSTEM_PROCESSOR}-linux-gnu" "\''${CMAKE_SYSTEM_PROCESSOR}-unknown-linux-gnu" \
--replace-fail "arm-linux-gnueabihf" "armv7l-unknown-linux-gnueabihf"
# If we don’t turn this off, then you won’t be able to run binaries that
# are installed by vcpkg.
find triplets -name '*linux*.cmake' -exec bash -c 'echo "set(X_VCPKG_RPATH_KEEP_SYSTEM_PATHS ON)" >> "$1"' -- {} \;