diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
| commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
| tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/development/libraries/libplacebo | |
| parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
| parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
| download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip | |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/development/libraries/libplacebo')
| -rw-r--r-- | pkgs/development/libraries/libplacebo/default.nix | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix index dc3e5e30c74..a7da64f787a 100644 --- a/pkgs/development/libraries/libplacebo/default.nix +++ b/pkgs/development/libraries/libplacebo/default.nix @@ -1,6 +1,5 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab -, fetchpatch , meson , ninja , pkg-config @@ -11,32 +10,22 @@ , glslang , lcms2 , epoxy +, libGL +, xorg }: stdenv.mkDerivation rec { pname = "libplacebo"; - version = "2.72.0"; + version = "3.120.3"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = "v${version}"; - sha256 = "1yhf9xyxdawbihsx89dpjlac800wrmpwx63rphad2nj225y9q40f"; + sha256 = "02hiyhnjdz3zqnzks9bi7my62a85k9k9vfgmh9fy19snsbkd6l80"; }; - patches = [ - # to work with latest glslang, remove on release >2.72.0 - (fetchpatch { - url = "https://code.videolan.org/videolan/libplacebo/-/commit/523056828ab86c2f17ea65f432424d48b6fdd389.patch"; - sha256 = "051vhd0l3yad1fzn5zayi08kqs9an9j8p7m63kgqyfv1ksnydpcs"; - }) - (fetchpatch { - url = "https://code.videolan.org/videolan/libplacebo/-/commit/82e3be1839379791b58e98eb049415b42888d5b0.patch"; - sha256 = "0nklj9gfiwkbbj6wfm1ck33hphaxrvzb84c4h2nfj88bapnlm90l"; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -51,13 +40,16 @@ stdenv.mkDerivation rec { glslang lcms2 epoxy + libGL + xorg.libX11 ]; mesonFlags = [ "-Dvulkan-registry=${vulkan-headers}/share/vulkan/registry/vk.xml" + "-Ddemos=false" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Reusable library for GPU-accelerated video/image rendering primitives"; longDescription = '' Reusable library for GPU-accelerated image/view processing primitives and |