Skip to content

Commit cfbc4e6

Browse files
committed
fix nix builds
1 parent a82f66a commit cfbc4e6

3 files changed

Lines changed: 24 additions & 10 deletions

File tree

.github/workflows/ci.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,16 @@ jobs:
3333
name: vs-nix-overlay
3434

3535
- name: Build
36-
run: nix build -L .#llvm_${{ matrix.llvm }}
36+
run: nix develop -L .#llvm_${{ matrix.llvm }} -c uv build --wheel --out-dir dist_llvm${{ matrix.llvm }}
37+
38+
- name: Upload
39+
uses: actions/upload-artifact@v7.0.1
40+
if: ${{ matrix.llvm == 22 }}
41+
with:
42+
name: wheel-${{ matrix.os }}
43+
path: |
44+
dist_llvm22/*.whl
45+
3746
3847
build-windows:
3948
runs-on: windows-latest
@@ -104,5 +113,6 @@ jobs:
104113
- name: Upload
105114
uses: actions/upload-artifact@v7.0.1
106115
with:
116+
name: wheel-win_amd64
107117
path: |
108118
dist/*.whl

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.nix

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
meson,
66
ninja,
77
pkg-config,
8+
python312,
9+
uv,
810
libllvm,
911
libxml2,
10-
vapoursynth,
1112
}:
1213
stdenv.mkDerivation (finalAttrs: {
1314
pname = "akarin";
@@ -36,23 +37,26 @@ stdenv.mkDerivation (finalAttrs: {
3637
meson
3738
ninja
3839
pkg-config
40+
python312
41+
uv
3942
];
4043

4144
buildInputs =
4245
[
4346
libllvm
4447
libxml2
45-
vapoursynth
4648
]
4749
# `std::to_chars()` for floating-point types was introduced in macOS 13.3.
4850
# But then `darwinMinVersionHook "13.0"` yields "error: 'from_chars' is
4951
# unavailable: introduced in macOS 26.0".
5052
++ lib.optional stdenv.hostPlatform.isDarwin (darwinMinVersionHook "26.0");
5153

52-
postPatch = ''
53-
substituteInPlace meson.build \
54-
--replace-fail "vapoursynth_dep.get_pkgconfig_variable('libdir')" "get_option('libdir')"
55-
'';
54+
env = {
55+
UV_PYTHON_DOWNLOADS = "never";
56+
UV_PYTHON_PREFERENCE = "only-system";
57+
} // lib.optionalAttrs stdenv.isLinux {
58+
LD_LIBRARY_PATH = lib.makeLibraryPath [ pythonManylinuxPackages.manylinux1 ];
59+
};
5660

5761
meta = {
5862
homepage = "https://github.com/Jaded-Encoding-Thaumaturgy/akarin-vapoursynth-plugin";

0 commit comments

Comments
 (0)