aboutsummaryrefslogtreecommitdiff
path: root/infra/libkookie/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
diff options
context:
space:
mode:
authorMx Kookie <kookie@spacekookie.de>2020-12-09 18:55:19 +0000
committerMx Kookie <kookie@spacekookie.de>2020-12-09 18:55:19 +0000
commit80d90d9b204f7c17912740f9f414fe5d59f293ba (patch)
tree5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
parent3a31a84c7d3e589035ad08499206aac44a81f424 (diff)
parent83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff)
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix')
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix14
1 files changed, 9 insertions, 5 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
index 66c8b1d5cc74..fa2088ca297b 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
@@ -1,16 +1,16 @@
-{ cmake, fetchFromGitHub, opencv3, stdenv, opencl-headers
+{ cmake, fetchFromGitHub, makeWrapper, opencv3, stdenv, ocl-icd, opencl-headers
, cudaSupport ? false, cudatoolkit ? null
}:
stdenv.mkDerivation rec {
pname = "waifu2x-converter-cpp";
- version = "5.2.4";
+ version = "5.3.3";
src = fetchFromGitHub {
owner = "DeadSix27";
repo = pname;
rev = "v${version}";
- sha256 = "0r7xcjqbyaa20gsgmjj7645640g3nb2bn1pc1nlfplwlzjxmz213";
+ sha256 = "04r0xyjknvcwk70ilj1p3qwlcz3i6sqgcp0qbc9qwxnsgrrgz09w";
};
patchPhase = ''
@@ -19,10 +19,14 @@ stdenv.mkDerivation rec {
'';
buildInputs = [
- opencv3 opencl-headers
+ ocl-icd opencv3 opencl-headers
] ++ stdenv.lib.optional cudaSupport cudatoolkit;
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [ cmake makeWrapper ];
+
+ preFixup = ''
+ wrapProgram $out/bin/waifu2x-converter-cpp --prefix LD_LIBRARY_PATH : "${ocl-icd}/lib"
+ '';
meta = {
description = "Improved fork of Waifu2X C++ using OpenCL and OpenCV";