Compare commits
No commits in common. "53ae3f8ce582c0a32dd356fcd8da032d69795f4a" and "5283df7b9885ac06ca38090e1e24b3b2709f265f" have entirely different histories.
53ae3f8ce5
...
5283df7b98
4
.github/workflows/cd.yml
vendored
4
.github/workflows/cd.yml
vendored
@ -153,7 +153,7 @@ jobs:
|
|||||||
git pull
|
git pull
|
||||||
|
|
||||||
- name: Install Dependencies
|
- name: Install Dependencies
|
||||||
run: vcpkg install pkgconf:x64-windows libsodium:x64-windows-static pthreads:x64-windows-static opus:x64-windows-static libvpx:x64-windows-static
|
run: vcpkg install libsodium:x64-windows-static pthreads:x64-windows-static pkgconf:x64-windows
|
||||||
|
|
||||||
# setup vs env
|
# setup vs env
|
||||||
- uses: ilammy/msvc-dev-cmd@v1
|
- uses: ilammy/msvc-dev-cmd@v1
|
||||||
@ -212,7 +212,7 @@ jobs:
|
|||||||
git pull
|
git pull
|
||||||
|
|
||||||
- name: Install Dependencies
|
- name: Install Dependencies
|
||||||
run: vcpkg install pkgconf:x64-windows libsodium:x64-windows-static pthreads:x64-windows-static opus:x64-windows-static libvpx:x64-windows-static
|
run: vcpkg install libsodium:x64-windows-static pthreads:x64-windows-static pkgconf:x64-windows
|
||||||
|
|
||||||
# setup vs env
|
# setup vs env
|
||||||
- uses: ilammy/msvc-dev-cmd@v1
|
- uses: ilammy/msvc-dev-cmd@v1
|
||||||
|
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@ -129,7 +129,7 @@ jobs:
|
|||||||
git pull
|
git pull
|
||||||
|
|
||||||
- name: Install Dependencies
|
- name: Install Dependencies
|
||||||
run: vcpkg install pkgconf:x64-windows libsodium:x64-windows-static pthreads:x64-windows-static opus:x64-windows-static libvpx:x64-windows-static
|
run: vcpkg install libsodium:x64-windows-static pthreads:x64-windows-static pkgconf:x64-windows
|
||||||
|
|
||||||
# setup vs env
|
# setup vs env
|
||||||
- uses: ilammy/msvc-dev-cmd@v1
|
- uses: ilammy/msvc-dev-cmd@v1
|
||||||
|
2
external/solanaceae_contact
vendored
2
external/solanaceae_contact
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 2401079c1daaa4b8fdae378a8cad8d429c619565
|
Subproject commit e8b069c803e81152c538c87c28a891717099b269
|
2
external/solanaceae_object_store
vendored
2
external/solanaceae_object_store
vendored
@ -1 +1 @@
|
|||||||
Subproject commit bccf7680e66d51683ad89f2f8e9659b35d34d90b
|
Subproject commit be24b3815bdf4d503a2db15ffaefc8cba7f2fce8
|
2
external/solanaceae_util
vendored
2
external/solanaceae_util
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 17d2baf7365c3499172dc5afd71171cb3a138d99
|
Subproject commit 4bda751f76be8e0028977ee918c9ba649bcf6d2d
|
@ -75,8 +75,6 @@
|
|||||||
#(libsodium.override { stdenv = pkgs.pkgsStatic.stdenv; })
|
#(libsodium.override { stdenv = pkgs.pkgsStatic.stdenv; })
|
||||||
#pkgsStatic.libsodium
|
#pkgsStatic.libsodium
|
||||||
libsodium
|
libsodium
|
||||||
libopus
|
|
||||||
libvpx
|
|
||||||
] ++ self.packages.${system}.default.dlopenBuildInputs;
|
] ++ self.packages.${system}.default.dlopenBuildInputs;
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
|
Loading…
Reference in New Issue
Block a user