diff options
Diffstat (limited to 'flake.nix')
| -rw-r--r-- | flake.nix | 28 |
1 files changed, 14 insertions, 14 deletions
@@ -22,7 +22,7 @@ overlays = [ (self: super: { libplacebo = super.libplacebo.overrideAttrs (oldAttrs: { - patches = oldAttrs.patches ++ [ + patches = [ ./subprojects/packagefiles/libplacebo/cache_ref_rect.diff ./subprojects/packagefiles/libplacebo/fix_rotate.diff ./subprojects/packagefiles/libplacebo/glClientWaitSync_0_return.diff @@ -110,7 +110,6 @@ ''; sha256 = "eHLMUqX7jDWoGsz5Coz8FU9b4MCtS+ZCJcPpYjPiDIQ="; }; - nvidia-support = false; sources = [ "file" "http" "cdio" ]; codecs = [ "ffmpeg" ]; window = "wayland"; @@ -123,6 +122,7 @@ "-Dtests=disabled" "-Drelease-asserts=false" ]; + nvidia-support = false; fixupPhase = if nvidia-support then '' wrapProgram $out/bin/cmv --set XDG_DATA_DIRS "${pkgs.mesa}/share:${pkgs.linuxPackages.nvidia_x11}/share" --set __EGL_VENDOR_LIBRARY_DIRS "${pkgs.mesa}/share/glvnd/egl_vendor.d:${pkgs.linuxPackages.nvidia_x11}/share/glvnd/egl_vendor.d" '' else '' @@ -162,7 +162,7 @@ alsa-lib libpulseaudio libplacebo - xxHash + xxhash lcms libdovi notcurses @@ -216,7 +216,7 @@ }; # https://cryptoisland.blog/posts/2024/12/09/flake-based-recipe-for-offline-dev-shells-in-nixos/ shellWrapper = with pkgs; let - shell = devShells.${system}.default; + shell = devShells.${stdenv.hostPlatform.system}.default; in pkgs.writeScriptBin "camu-devshell" '' export PATH=${pkgs.lib.makeBinPath shell.nativeBuildInputs}:$PATH export PKG_CONFIG_PATH=${pkgs.lib.makeSearchPathOutput "dev" "lib/pkgconfig" shell.buildInputs}:$PKG_CONFIG_PATH @@ -230,7 +230,7 @@ devShells = forAllDevSystems (pkgs: rec { default = with pkgs; mkShell rec { NIX_HARDENING_ENABLE = ""; - nativeBuildInputs = packages.${system}.default.nativeBuildInputs ++ [ + nativeBuildInputs = packages.${stdenv.hostPlatform.system}.default.nativeBuildInputs ++ [ gdb clang-analyzer perf-tools @@ -278,7 +278,7 @@ #lollypop #xfce.parole ]; - buildInputs = packages.${system}.default.buildInputs ++ [ + buildInputs = packages.${stdenv.hostPlatform.system}.default.buildInputs ++ [ # glfw3 build xinput libXinerama @@ -301,7 +301,7 @@ # libva from Nix. export LIBVA_DRIVERS_PATH="${pkgs.mesa}/lib/dri" export NIX_BUILD_SHELL=$SHELL - export NIX_SHELL="camu-${system}+dev" + export NIX_SHELL="camu-${stdenv.hostPlatform.system}+dev" export PS1="(\$NIX_SHELL)"$PS1 echo -en '\033]2;'nix-shell: $NIX_SHELL'\007' ''; @@ -309,17 +309,17 @@ buildtest = with pkgs; mkShell { NIX_HARDENING_ENABLE = ""; - nativeBuildInputs = packages.${system}.default.nativeBuildInputs ++ [ + nativeBuildInputs = packages.${stdenv.hostPlatform.system}.default.nativeBuildInputs ++ [ gdb clang-analyzer perf-tools valgrind ]; - buildInputs = packages.${system}.default.buildInputs; + buildInputs = packages.${stdenv.hostPlatform.system}.default.buildInputs; shellHook = '' export SHELL="${pkgs.bashInteractive}/bin/bash" export NIX_BUILD_SHELL=$SHELL - export NIX_SHELL="camu-${system}" + export NIX_SHELL="camu-${stdenv.hostPlatform.system}" export PS1="(\$NIX_SHELL)"$PS1 ''; }; @@ -375,7 +375,7 @@ glslang ]; buildInputs = with pkgsCross.ucrt64; [ - zlib.static + (zlib.override { shared = false; }) (bzip2.override { enableStatic = true; enableShared = false; }) (soxr.overrideAttrs (oldAttrs: { cmakeFlags = oldAttrs.cmakeFlags ++ [ "-DBUILD_STATIC_LIBS=ON" "-DBUILD_SHARED_LIBS=OFF" ]; @@ -384,7 +384,7 @@ mesonFlags = oldAttrs.mesonFlags ++ [ "--default-library=static" ]; })) (openssl.override { static = true; }) - xxHash + xxhash (libiconv.override { enableStatic = true; enableShared = false; }) vulkan-headers #(shaderc.overrideAttrs (oldAttrs: { @@ -420,13 +420,13 @@ NIX_HARDENING_ENABLE = ""; nativeBuildInputs = mingw64.nativeBuildInputs; buildInputs = with pkgsCross.mingw32; [ - (buildWithFlags zlib.static "-Os") + (buildWithFlags (zlib.override { shared = false; }) "-Os") ((buildWithFlags bzip2 "-Os").override { enableStatic = true; enableShared = false; }) ((buildWithFlags soxr "-Os").overrideAttrs (oldAttrs: { cmakeFlags = oldAttrs.cmakeFlags ++ [ "-DBUILD_STATIC_LIBS=ON" "-DBUILD_SHARED_LIBS=OFF" ]; })) ((buildWithFlags openssl "-Os").override { static = true; }) - (buildWithFlags xxHash "-Os") + (buildWithFlags xxhash "-Os") ((buildWithFlags libiconv "-Os").override { enableStatic = true; enableShared = false; }) vulkan-headers ]; |