From 2d007d87546e82cca93cdbf09e38d1675e35f6ed Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Fri, 22 Jan 2021 14:08:07 +0100 Subject: [PATCH] vapoursynthPlugins.{eedi3m,tcanny}: fix build --- plugins/eedi3m/default.nix | 6 +++++- plugins/tcanny/default.nix | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/plugins/eedi3m/default.nix b/plugins/eedi3m/default.nix index 9cd7005..2d9e92e 100644 --- a/plugins/eedi3m/default.nix +++ b/plugins/eedi3m/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, vapoursynth, boost, opencl-headers, ocl-icd }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, vapoursynth, boost, opencl-headers, ocl-icd }: stdenv.mkDerivation rec { pname = "vapoursynth-eedi3"; @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ vapoursynth boost opencl-headers ocl-icd ]; + # https://github.com/NixOS/nixpkgs/issues/86131 + BOOST_INCLUDEDIR = "${lib.getDev boost}/include"; + BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; + postPatch = '' substituteInPlace meson.build \ --replace "vapoursynth_dep.get_pkgconfig_variable('libdir')" "get_option('libdir')" diff --git a/plugins/tcanny/default.nix b/plugins/tcanny/default.nix index 5cb64a5..62af76b 100644 --- a/plugins/tcanny/default.nix +++ b/plugins/tcanny/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, vapoursynth, boost, opencl-headers, ocl-icd }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, vapoursynth, boost, opencl-headers, ocl-icd }: stdenv.mkDerivation rec { pname = "vapoursynth-tcanny"; @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ vapoursynth boost opencl-headers ocl-icd ]; + # https://github.com/NixOS/nixpkgs/issues/86131 + BOOST_INCLUDEDIR = "${lib.getDev boost}/include"; + BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; + postPatch = '' substituteInPlace meson.build \ --replace "vapoursynth_dep.get_pkgconfig_variable('libdir')" "get_option('libdir')"