Loading pkgs/applications/misc/huggle/00-remove-third-party.patch +3 −14 Original line number Diff line number Diff line diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a37976e..5669366 100644 index b7530e8f..af94a62d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -59,16 +59,12 @@ if(NOT MINGW AND WIN32) @@ -59,8 +59,7 @@ if(NOT MINGW AND WIN32) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_BINARY_DIR}/Debug) endif() Loading @@ -11,15 +11,4 @@ index a37976e..5669366 100644 +include_directories(@libirc_includes@) # YAML -option(YAML_CPP_BUILD_TOOLS "Disable tests" OFF) -option(YAML_CPP_BUILD_TESTS "Enable testing" OFF) -option(YAML_CPP_BUILD_TOOLS "Enable parse tools" OFF) -option(BUILD_SHARED_LIBS "Build as shared" ON) -include_directories("3rd/yaml-cpp/include/") -add_subdirectory(3rd/yaml-cpp) +find_package(YAML-CPP 0.6.3 QUIET) +include_directories(YAML_CPP_INCLUDE_DIR) + if (HUGGLE_EXT) if(NOT MINGW AND WIN32) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_BINARY_DIR}/Release/extensions) find_package(YAML-CPP 0.6.3 QUIET) pkgs/applications/misc/huggle/default.nix +2 −2 Original line number Diff line number Diff line Loading @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "huggle"; version = "3.4.10"; version = "3.4.12"; src = fetchFromGitHub { owner = "huggle"; repo = "huggle3-qt-lx"; rev = version; sha256 = "UzoX4kdzYU50W0MUhfpo0HaSfvG3eINNC8u5t/gKuqI="; sha256 = "scNGmMVZ6z9FTQuZCdwRYk0WP5qKfdb/M9Co8TbiMDE="; fetchSubmodules = true; }; Loading Loading
pkgs/applications/misc/huggle/00-remove-third-party.patch +3 −14 Original line number Diff line number Diff line diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a37976e..5669366 100644 index b7530e8f..af94a62d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -59,16 +59,12 @@ if(NOT MINGW AND WIN32) @@ -59,8 +59,7 @@ if(NOT MINGW AND WIN32) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_BINARY_DIR}/Debug) endif() Loading @@ -11,15 +11,4 @@ index a37976e..5669366 100644 +include_directories(@libirc_includes@) # YAML -option(YAML_CPP_BUILD_TOOLS "Disable tests" OFF) -option(YAML_CPP_BUILD_TESTS "Enable testing" OFF) -option(YAML_CPP_BUILD_TOOLS "Enable parse tools" OFF) -option(BUILD_SHARED_LIBS "Build as shared" ON) -include_directories("3rd/yaml-cpp/include/") -add_subdirectory(3rd/yaml-cpp) +find_package(YAML-CPP 0.6.3 QUIET) +include_directories(YAML_CPP_INCLUDE_DIR) + if (HUGGLE_EXT) if(NOT MINGW AND WIN32) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_BINARY_DIR}/Release/extensions) find_package(YAML-CPP 0.6.3 QUIET)
pkgs/applications/misc/huggle/default.nix +2 −2 Original line number Diff line number Diff line Loading @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "huggle"; version = "3.4.10"; version = "3.4.12"; src = fetchFromGitHub { owner = "huggle"; repo = "huggle3-qt-lx"; rev = version; sha256 = "UzoX4kdzYU50W0MUhfpo0HaSfvG3eINNC8u5t/gKuqI="; sha256 = "scNGmMVZ6z9FTQuZCdwRYk0WP5qKfdb/M9Co8TbiMDE="; fetchSubmodules = true; }; Loading