From 77b54c35bf9587450cd636e0d7df37e190e28bfb Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Mon, 13 Apr 2026 17:01:47 -0400 Subject: Smaller stuff that went uncommitted Signed-off-by: Andrew Opalach --- env/build_cmds.txt | 16 ++++++++++------ env/nixpkgs-patches/289217.diff | 24 ------------------------ 2 files changed, 10 insertions(+), 30 deletions(-) delete mode 100644 env/nixpkgs-patches/289217.diff (limited to 'env') diff --git a/env/build_cmds.txt b/env/build_cmds.txt index 821e19d..db1ffa7 100644 --- a/env/build_cmds.txt +++ b/env/build_cmds.txt @@ -1,3 +1,7 @@ +# Testing +meson setup build -Dserver=enabled -Dclient=enabled -Dportal=enabled -Dtests=enabled \ + --force-fallback-for=libplacebo + # Android meson setup build-android -Dserver=disabled -Drenderer-api=gl -Dwindow=glfm \ -Dcodec-ffmpeg-version=8 -Dcodec-hwaccels=mediacodec -Dtests=disabled \ @@ -6,23 +10,23 @@ meson setup build-android -Dserver=disabled -Drenderer-api=gl -Dwindow=glfm \ # MingW DX11 (Preferred) meson setup build-mingw64-dx11 -Drenderer-api=dx11 -Drenderer=libplacebo -Dwindow=win32 \ -Dsink-only=false -Dserver=enabled -Dportal=disabled -Dclient=disabled \ - -Dcodecs=ffmpeg,stb_image -Dcodec-ffmpeg-version=8 -Dcodec-hwaccels=d3d11va -Dsubtitles=enabled \ + -Dsources=file -Dcodecs=ffmpeg,stb_image -Dcodec-ffmpeg-version=8 -Dcodec-hwaccels=d3d11va -Dsubtitles=enabled \ -Dtests=disabled -Dwin32-compat=false --cross-file ./cross/x86_64-w64-mingw32.txt \ - --default-library=static --buildtype=release --optimization=s -Ddebug=false --strip + --default-library=static --strip --buildtype=release --optimization=s -Ddebug=false -Db_lto=false # MingW Vulkan meson setup build-mingw64-vulkan -Drenderer-api=vulkan -Drenderer=libplacebo -Dwindow=win32 \ -Dsink-only=false -Dserver=enabled -Dportal=disabled -Dclient=disabled \ - -Dcodecs=ffmpeg,stb_image -Dcodec-ffmpeg-version=8 -Dcodec-hwaccels=vulkan -Dsubtitles=enabled \ + -Dsources=file -Dcodecs=ffmpeg,stb_image -Dcodec-ffmpeg-version=8 -Dcodec-hwaccels=vulkan -Dsubtitles=enabled \ -Dtests=disabled -Dwin32-compat=false --cross-file ./cross/x86_64-w64-mingw32.txt \ - --default-library=static --buildtype=release --optimization=2 -Ddebug=false --strip + --default-library=static --strip --buildtype=release --optimization=2 -Ddebug=false # Windows XP 32bit Support. meson setup build-mingw32-min -Drenderer-api=gl -Drenderer=momo -Dwindow=win32 \ -Dsink-only=false -Dserver=enabled -Dportal=disabled -Dclient=disabled \ - -Dcodecs=ffmpeg -Dcodec-ffmpeg-version=3 -Dsubtitles=enabled \ + -Dsources=file -Dcodecs=ffmpeg -Dcodec-ffmpeg-version=3 -Dsubtitles=enabled \ -Dtests=disabled -Dwin32-compat=true --cross-file ./cross/i686-w64-mingw32.txt \ - --default-library=static --buildtype=release --optimization=s -Ddebug=false --strip + --default-library=static --strip --buildtype=release --optimization=s -Ddebug=false # ASan meson setup build-asan --buildtype=debug -Db_sanitize=address -Db_lundef=false \ diff --git a/env/nixpkgs-patches/289217.diff b/env/nixpkgs-patches/289217.diff deleted file mode 100644 index 40204b4..0000000 --- a/env/nixpkgs-patches/289217.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix -index 8982382247939b..35a32dc6e8bf1b 100644 ---- a/pkgs/development/compilers/shaderc/default.nix -+++ b/pkgs/development/compilers/shaderc/default.nix -@@ -48,9 +48,16 @@ stdenv.mkDerivation rec { - ++ lib.optionals stdenv.isDarwin [ cctools ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]; - -- postInstall = '' -- moveToOutput "lib/*.a" $static -- ''; -+ postInstall = if stdenv.targetPlatform.isWindows then -+ # There are only static libraries on windows so link the outputs -+ '' -+ ln -s $lib $static -+ '' -+ else -+ '' -+ moveToOutput "lib/*.a" $static -+ '' -+ ; - - cmakeFlags = [ "-DSHADERC_SKIP_TESTS=ON" ]; - -- cgit v1.2.3-101-g0448