tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
waifu2x-converter-cpp: Enable build on Darwin
Randy Eckenrode
4 years ago
bf27bf09
4f5bc22a
+30
-6
3 changed files
expand all
collapse all
unified
split
pkgs
tools
graphics
waifu2x-converter-cpp
default.nix
waifu2x_darwin_build.diff
top-level
all-packages.nix
+12
-5
pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
···
1
1
-
{ cmake, fetchFromGitHub, makeWrapper, opencv3, lib, stdenv, ocl-icd, opencl-headers
1
1
+
{ cmake, fetchFromGitHub, makeWrapper, opencv3, lib, stdenv, ocl-icd, opencl-headers, OpenCL
2
2
, cudaSupport ? false, cudatoolkit ? null
3
3
}:
4
4
···
13
13
sha256 = "0rv8bnyxz89za6gwk9gmdbaf3j7c1j52mip7h81rir288j35m84x";
14
14
};
15
15
16
16
+
patches = [
17
17
+
# Remove the hard-coded compiler on Darwin and use the one in stdenv.
18
18
+
./waifu2x_darwin_build.diff
19
19
+
];
20
20
+
16
21
buildInputs = [
17
17
-
ocl-icd opencv3 opencl-headers
18
18
-
] ++ lib.optional cudaSupport cudatoolkit;
22
22
+
opencv3
23
23
+
] ++ lib.optional cudaSupport cudatoolkit
24
24
+
++ lib.optional stdenv.isDarwin OpenCL
25
25
+
++ lib.optionals stdenv.isLinux [ ocl-icd opencl-headers ];
19
26
20
27
nativeBuildInputs = [ cmake makeWrapper ];
21
28
22
22
-
preFixup = ''
29
29
+
preFixup = lib.optionalString stdenv.isLinux ''
23
30
wrapProgram $out/bin/waifu2x-converter-cpp --prefix LD_LIBRARY_PATH : "${ocl-icd}/lib"
24
31
'';
25
32
···
28
35
homepage = "https://github.com/DeadSix27/waifu2x-converter-cpp";
29
36
license = lib.licenses.mit;
30
37
maintainers = [ lib.maintainers.xzfc ];
31
31
-
platforms = lib.platforms.linux;
38
38
+
platforms = lib.platforms.linux ++ lib.platforms.darwin;
32
39
};
33
40
}
+15
pkgs/tools/graphics/waifu2x-converter-cpp/waifu2x_darwin_build.diff
···
1
1
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2
2
+
index 8b728b5..dedf8b6 100644
3
3
+
--- a/CMakeLists.txt
4
4
+
+++ b/CMakeLists.txt
5
5
+
@@ -71,10 +71,6 @@ message(STATUS "System is: ${CMAKE_SYSTEM_NAME} (${LOCAL_SYS_TYPE})")
6
6
+
7
7
+
### Get binary paths for APPLE users
8
8
+
if(APPLE AND CMAKE_CXX_COMPILER_ID MATCHES "^(Apple)?Clang$")
9
9
+
- set(CMAKE_C_COMPILER "/usr/local/opt/llvm/bin/clang")
10
10
+
- set(CMAKE_CXX_COMPILER "/usr/local/opt/llvm/bin/clang++")
11
11
+
- set(CMAKE_EXE_LINKER_FLAGS "-L/usr/local/opt/llvm/lib -Wl,-rpath,/usr/local/opt/llvm/lib")
12
12
+
- set(CMAKE_SHARED_LINKER_FLAGS "-L/usr/local/opt/llvm/lib -Wl,-rpath,/usr/local/opt/llvm/lib")
13
13
+
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
14
14
+
set(FILE_SYSTEM_LIB "c++fs")
15
15
+
endif()
+3
-1
pkgs/top-level/all-packages.nix
···
9923
9923
openssl = openssl_1_0_2;
9924
9924
};
9925
9925
9926
9926
-
waifu2x-converter-cpp = callPackage ../tools/graphics/waifu2x-converter-cpp { };
9926
9926
+
waifu2x-converter-cpp = callPackage ../tools/graphics/waifu2x-converter-cpp {
9927
9927
+
inherit (darwin.apple_sdk.frameworks) OpenCL;
9928
9928
+
};
9927
9929
9928
9930
wakatime = pythonPackages.callPackage ../tools/misc/wakatime { };
9929
9931