diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-09-13 11:53:06 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-09-13 17:18:49 +0000 |
commit | c3e005913d59b8ad64004e60888a71816688af1f (patch) | |
tree | f65b32f0d16acaa40f2ee82ac736d150de4b6cf5 /nixpkgs/pkgs/development/libraries/libplacebo | |
parent | 1c8034da05499ca3d999f57ba1f6b235e7711ee1 (diff) | |
parent | db88608d8c811a93b74c99cfa1224952afc78200 (diff) | |
download | nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.gz nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.bz2 nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.lz nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.xz nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.zst nixlib-c3e005913d59b8ad64004e60888a71816688af1f.zip |
Merge commit 'db88608d8c811a93b74c99cfa1224952afc78200'
Conflicts: nixpkgs/nixos/modules/config/update-users-groups.pl
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libplacebo')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libplacebo/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libplacebo/default.nix b/nixpkgs/pkgs/development/libraries/libplacebo/default.nix index a7da64f787a3..099bac9274b2 100644 --- a/nixpkgs/pkgs/development/libraries/libplacebo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libplacebo/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "libplacebo"; - version = "3.120.3"; + version = "4.157.0"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = "v${version}"; - sha256 = "02hiyhnjdz3zqnzks9bi7my62a85k9k9vfgmh9fy19snsbkd6l80"; + sha256 = "08kqsd29h8wm0vz7698wh2mdgpwv6anqc5n7d1spnnamwyfwc64h"; }; nativeBuildInputs = [ @@ -46,7 +46,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dvulkan-registry=${vulkan-headers}/share/vulkan/registry/vk.xml" - "-Ddemos=false" + "-Ddemos=false" # Don't build and install the demo programs + "-Dd3d11=disabled" # Disable the Direct3D 11 based renderer ]; meta = with lib; { |