diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
| commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
| tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/libraries/libplacebo | |
| parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
| parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
| download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libplacebo')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libplacebo/default.nix | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libplacebo/default.nix b/nixpkgs/pkgs/development/libraries/libplacebo/default.nix index 73d97a476559..60a3f8989578 100644 --- a/nixpkgs/pkgs/development/libraries/libplacebo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libplacebo/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitLab , meson , ninja @@ -7,53 +8,58 @@ , vulkan-headers , vulkan-loader , shaderc -, glslang , lcms2 -, libepoxy , libGL , xorg , libunwind +, libdovi }: stdenv.mkDerivation rec { pname = "libplacebo"; - version = "4.208.0"; + version = "5.264.1"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = "v${version}"; - sha256 = "161dp5781s74ca3gglaxlmchx7glyshf0wg43w98pl22n1jcm5qk"; + hash = "sha256-YEefuEfJURi5/wswQKskA/J1UGzessQQkBpltJ0Spq8="; }; nativeBuildInputs = [ meson ninja pkg-config - python3Packages.Mako + vulkan-headers + python3Packages.jinja2 + python3Packages.glad2 ]; buildInputs = [ - vulkan-headers vulkan-loader shaderc - glslang lcms2 - libepoxy libGL xorg.libX11 libunwind + libdovi ]; mesonFlags = [ "-Dvulkan-registry=${vulkan-headers}/share/vulkan/registry/vk.xml" "-Ddemos=false" # Don't build and install the demo programs "-Dd3d11=disabled" # Disable the Direct3D 11 based renderer + "-Dglslang=disabled" # rely on shaderc for GLSL compilation instead ] ++ lib.optionals stdenv.isDarwin [ "-Dunwind=disabled" # libplacebo doesn’t build with `darwin.libunwind` ]; + postPatch = '' + substituteInPlace meson.build \ + --replace 'python_env.append' '#' + ''; + meta = with lib; { description = "Reusable library for GPU-accelerated video/image rendering primitives"; longDescription = '' |