From 420f0adca53282e3ff42da2dfefb640b1180897c Mon Sep 17 00:00:00 2001 From: Carlos Fernandez Sanz Date: Tue, 22 Oct 2019 10:33:30 -0700 Subject: [PATCH] Disabled libvmaf for ffmpeg-full on darwin. Added postFixup to libvmaf. Removed period at end of description. --- pkgs/development/libraries/libvmaf/default.nix | 7 ++++++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libvmaf/default.nix b/pkgs/development/libraries/libvmaf/default.nix index e727c4b3fe50..82c76f7ea372 100644 --- a/pkgs/development/libraries/libvmaf/default.nix +++ b/pkgs/development/libraries/libvmaf/default.nix @@ -15,11 +15,16 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; doCheck = true; + postFixup = '' + substituteInPlace "$dev/lib/pkgconfig/libvmaf.pc" \ + --replace "includedir=/usr/local/include" "includedir=$dev" + ''; + makeFlags = [ "INSTALL_PREFIX=${placeholder "out"}" ]; meta = with stdenv.lib; { homepage = "https://github.com/Netflix/vmaf"; - description = "Perceptual video quality assessment based on multi-method fusion (VMAF)."; + description = "Perceptual video quality assessment based on multi-method fusion (VMAF)"; platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.cfsmp3 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70bd668e4afd..cf78c37c5e5c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10801,6 +10801,7 @@ in frei0r = if stdenv.isDarwin then null else frei0r; game-music-emu = if stdenv.isDarwin then null else game-music-emu; libjack2 = if stdenv.isDarwin then null else libjack2; + libvmaf = if stdenv.isDarwin then null else libvmaf; libmodplug = if stdenv.isDarwin then null else libmodplug; openal = if stdenv.isDarwin then null else openal; libmfx = if stdenv.isDarwin then null else intel-media-sdk;