diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2020-11-27 12:08:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-27 12:08:13 +0100 |
commit | 33b99efb96d4df3bfdc680e9b5a6d13bcbb2a91a (patch) | |
tree | d252fe4e8fa6d24042af61af0cecbefdf2ae295c /pkgs/tools/graphics | |
parent | 5cd9fe63c70716b0babbbdb8f4491a390ac78cd7 (diff) | |
parent | ca3dd4b52f6ffdb9310a9fca2be8a41e413ba857 (diff) |
Merge pull request #100860 from sbruder/waifu2x-opencl
Diffstat (limited to 'pkgs/tools/graphics')
-rw-r--r-- | pkgs/tools/graphics/waifu2x-converter-cpp/default.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix index 66c8b1d5cc74..fa2088ca297b 100644 --- a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix +++ b/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"; |