Unverified Commit 017ee141 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #314433 from SuperSandro2000/mpv-nox 

nixos/no-x-libs: fix mpv build
parents b67d271a b9ec2c14

nixos/modules/config/no-x-libs.nix

+2 −1
Original line number Diff line number Diff line
@@ -54,10 +54,11 @@ with lib; 
      intel-vaapi-driver = super.intel-vaapi-driver.override { enableGui = false; };

      libdevil = super.libdevil-nox;

      libextractor = super.libextractor.override { gtkSupport = false; };

      libplacebo = super.libplacebo.override { vulkanSupport = false; };

      libva = super.libva-minimal;

      limesuite = super.limesuite.override { withGui = false; };

      mc = super.mc.override { x11Support = false; };

      mpv-unwrapped = super.mpv-unwrapped.override { sdl2Support = false; x11Support = false; waylandSupport = false; };

      mpv-unwrapped = super.mpv-unwrapped.override { drmSupport = false; screenSaverSupport = false; sdl2Support = false; vulkanSupport = false; waylandSupport = false; x11Support = false; };

      msmtp = super.msmtp.override { withKeyring = false; };

      mupdf = super.mupdf.override { enableGL = false; enableX11 = false; };

      neofetch = super.neofetch.override { x11Support = false; };

pkgs/development/libraries/libplacebo/default.nix

+6 −3
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
, libdovi

, xxHash

, fast-float

, vulkanSupport ? true

}:



stdenv.mkDerivation rec {
@@ -33,13 +34,11 @@ stdenv.mkDerivation rec { 
    meson

    ninja

    pkg-config

    vulkan-headers

    python3Packages.jinja2

    python3Packages.glad2

  ];



  buildInputs = [

    vulkan-loader

    shaderc

    lcms2

    libGL
@@ -47,15 +46,19 @@ stdenv.mkDerivation rec { 
    libunwind

    libdovi

    xxHash

    vulkan-headers

  ] ++ lib.optionals vulkanSupport [

    vulkan-loader

  ] ++ lib.optionals (!stdenv.cc.isGNU) [

    fast-float

  ];



  mesonFlags = with lib; [

    (mesonOption "vulkan-registry" "${vulkan-headers}/share/vulkan/registry/vk.xml")

    (mesonBool "demos" false) # Don't build and install the demo programs

    (mesonEnable "d3d11" false) # Disable the Direct3D 11 based renderer

    (mesonEnable "glslang" false) # rely on shaderc for GLSL compilation instead

    (mesonEnable "vk-proc-addr" vulkanSupport)

    (mesonOption "vulkan-registry" "${vulkan-headers}/share/vulkan/registry/vk.xml")

  ] ++ optionals stdenv.isDarwin [

    (mesonEnable "unwind" false) # libplacebo doesn’t build with `darwin.libunwind`

  ];

pkgs/development/libraries/rubberband/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, pkg-config, libsamplerate, libsndfile, fftw

, lv2, jdk

, lv2, jdk_headless

, vamp-plugin-sdk, ladspaH, meson, ninja, darwin }:



stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec { 
    hash = "sha256-2e+J4rjvn4WxOsPC+uww4grPLJ86nIxFzmN/K8leV2w=";

  };



  nativeBuildInputs = [ pkg-config meson ninja jdk ];

  nativeBuildInputs = [ pkg-config meson ninja jdk_headless ];

  buildInputs = [ libsamplerate libsndfile fftw vamp-plugin-sdk ladspaH lv2 ] ++ lib.optionals stdenv.isDarwin

    (with darwin.apple_sdk.frameworks; [Accelerate CoreGraphics CoreVideo]);

  makeFlags = [ "AR:=$(AR)" ];