ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-06 12:39:54 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #314433 from SuperSandro2000/mpv-nox

Browse Source 
nixos/no-x-libs: fix mpv build
This commit is contained in:
Pol Dellaiera 2024-05-26 07:56:52 +02:00 committed by GitHub
commit 017ee1411d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/config/no-x-libs.nix
View File

@ -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; };

9
pkgs/development/libraries/libplacebo/default.nix
View File

@ -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`
];

4
pkgs/development/libraries/rubberband/default.nix
View File

@ -1,5 +1,5 @@
{ 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)" ];