Skip to content

Commit 396d37e

Browse files
committed
Add permissions to GitHub Actions workflow
Fix linker flags for macOS static builds in flake.nix
1 parent 5a8b712 commit 396d37e

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ jobs:
66
build:
77
name: ${{ matrix.os }}
88
runs-on: ${{ matrix.os }}
9+
permissions:
10+
contents: read
11+
id-token: write
912
strategy:
1013
fail-fast: false
1114
matrix:

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
"-DCMAKE_EXE_LINKER_FLAGS=-static"
171171
]
172172
++ pkgsForHost.lib.optionals (isStatic && pkgsForHost.stdenv.isDarwin) [
173-
"-DCMAKE_EXE_LINKER_FLAGS=-framework CoreVideo -framework VideoToolbox"
173+
"-DCMAKE_EXE_LINKER_FLAGS=-framework CoreVideo;-framework VideoToolbox"
174174
]
175175
++ pkgsForHost.lib.optionals (pkgsForHost.stdenv.isLinux && !isStatic && !isWindows) [
176176
"-DENABLE_GIO=ON"

0 commit comments

Comments
 (0)