From 0790af3209eaf844f9c3b7cf6c66ebc1096c4c23 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 24 Apr 2024 18:33:06 +0200 Subject: [PATCH] xevd: 0.4.1 -> 0.5.0 --- pkgs/by-name/xe/xevd/package.nix | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/xe/xevd/package.nix b/pkgs/by-name/xe/xevd/package.nix index 8cf6d20fbfe8..d448a7f3e43d 100644 --- a/pkgs/by-name/xe/xevd/package.nix +++ b/pkgs/by-name/xe/xevd/package.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - fetchpatch2, stdenv, gitUpdater, cmake, @@ -9,28 +8,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "xevd"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "mpeg5"; repo = "xevd"; rev = "v${finalAttrs.version}"; - hash = "sha256-+qC/BnP8o/kfl5ax+g1PohvXIJBL2gin/QZ9Gkvi0WU="; + hash = "sha256-Dc2V77t+DrZo9252FAL0eczrmikrseU02ob2RLBdVvU="; }; - patches = [ - (fetchpatch2 { - name = "fix dangling pointer error"; - url = "https://github.com/mpeg5/xevd/commit/13b86a74e26df979dd1cc3a1cb19bf1ac828e197.patch"; - sha256 = "sha256-CeSfhN78ldooyZ9H4F2ex9wTBFXuNZdBcnLdk7GqDXI="; - }) - (fetchpatch2 { - name = "fix invalid comparison of c_buf in write_y4m_header "; - url = "https://github.com/mpeg5/xevd/commit/e4ae0c567a6ec5e10c9f5ed44c61e4e3b6816c16.patch"; - sha256 = "sha256-9bG6hyIV/AZ0mRbd3Fc/c137Xm1i6NJ1IfuGadG0vUU="; - }) - ]; - postPatch = '' echo v$version > version.txt ''; @@ -41,8 +27,6 @@ stdenv.mkDerivation (finalAttrs: { ln $dev/include/xevd/* $dev/include/ ''; - env.NIX_CFLAGS_COMPILE = toString [ "-lm" ]; - outputs = [ "out" "lib" @@ -58,6 +42,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "xevd_app"; maintainers = with lib.maintainers; [ jopejoe1 ]; platforms = lib.platforms.all; - broken = !stdenv.hostPlatform.isx86; + broken = !stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isDarwin; }; })