Compare commits

..

No commits in common. "d026598da492ab82541121b8cde0c6a86216e24a" and "2caaf0b89ebf8edb9a1b0400c774670d838ef12f" have entirely different histories.

2 changed files with 9 additions and 37 deletions

View File

@ -1,5 +1,4 @@
{ stdenv { stdenv
, fetchurl
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
@ -65,14 +64,6 @@ let
pname = "polymc" + (lib.optionalString ((lib.versions.major qtbase.version) == "5") "-qt5"); pname = "polymc" + (lib.optionalString ((lib.versions.major qtbase.version) == "5") "-qt5");
version = "7.0"; version = "7.0";
patches = [
# Fix for Qt >= 6.9.0
(fetchurl {
url = "https://github.com/PolyMC/PolyMC/commit/0dc124d636d76692b1e2c01050743dd87dc78a05.patch";
hash = "sha256-ACrS7JAcLq46f8puQlfvPlRb6vk/+wuv+y1yqGQjp/I=";
})
];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "PolyMC"; owner = "PolyMC";
repo = "PolyMC"; repo = "PolyMC";

View File

@ -1,46 +1,30 @@
{ { lib
lib, , stdenv
stdenv, , fetchFromGitHub
fetchFromGitHub, , cmake
cmake, , nasm
nasm,
cpuinfo,
libdovi,
hdr10plus ? null,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "svt-av1-psy"; pname = "svt-av1-psy";
version = "3.0.2"; version = "2.2.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gianni-rosato"; owner = "gianni-rosato";
repo = "svt-av1-psy"; repo = "svt-av1-psy";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-le/t03vM4WyBswDOLiI3yUnsvpY0jVXeupkkCt8UrXE="; hash = "sha256-4ds7yrUMp0O5/aWOkdnrANR1D3djajU/0ZeY6xJnpHI=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
nasm nasm
]; ];
makeBuildType = "Release";
buildInputs = [
cpuinfo
libdovi
]
++
(lib.optionals (hdr10plus!=null) [hdr10plus]);
cmakeFlags = [ cmakeFlags = [
"-DSVT_AV1_LTO=ON" "-DSVT_AV1_LTO=ON"
"-DUSE_EXTERNAL_CPUINFO=ON" ];
"-DLIBDOVI_FOUND=ON"
]
++
(lib.optionals (hdr10plus!=null) ["-DLIBHDR10PLUS_RS_FOUND=ON"]);
meta = with lib; { meta = with lib; {
homepage = "https://github.com/gianni-rosato/svt-av1-psy"; homepage = "https://github.com/gianni-rosato/svt-av1-psy";
@ -51,10 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
The goal is to create the best encoding implementation for perceptual quality with AV1. The goal is to create the best encoding implementation for perceptual quality with AV1.
''; '';
license = with licenses; [ license = with licenses; [ aom bsd3 ];
aom
bsd3
];
platforms = platforms.unix; platforms = platforms.unix;
}; };
}) })