tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
huggle: 3.4.10 -> 3.4.12
Deadbeef
2 years ago
ee29d7be
195e6dc2
+5
-16
2 changed files
expand all
collapse all
unified
split
pkgs
applications
misc
huggle
00-remove-third-party.patch
default.nix
+3
-14
pkgs/applications/misc/huggle/00-remove-third-party.patch
···
1
1
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
2
2
-
index a37976e..5669366 100644
2
2
+
index b7530e8f..af94a62d 100644
3
3
--- a/src/CMakeLists.txt
4
4
+++ b/src/CMakeLists.txt
5
5
-
@@ -59,16 +59,12 @@ if(NOT MINGW AND WIN32)
5
5
+
@@ -59,8 +59,7 @@ if(NOT MINGW AND WIN32)
6
6
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_BINARY_DIR}/Debug)
7
7
endif()
8
8
···
11
11
+include_directories(@libirc_includes@)
12
12
13
13
# YAML
14
14
-
-option(YAML_CPP_BUILD_TOOLS "Disable tests" OFF)
15
15
-
-option(YAML_CPP_BUILD_TESTS "Enable testing" OFF)
16
16
-
-option(YAML_CPP_BUILD_TOOLS "Enable parse tools" OFF)
17
17
-
-option(BUILD_SHARED_LIBS "Build as shared" ON)
18
18
-
-include_directories("3rd/yaml-cpp/include/")
19
19
-
-add_subdirectory(3rd/yaml-cpp)
20
20
-
+find_package(YAML-CPP 0.6.3 QUIET)
21
21
-
+include_directories(YAML_CPP_INCLUDE_DIR)
22
22
-
+
23
23
-
if (HUGGLE_EXT)
24
24
-
if(NOT MINGW AND WIN32)
25
25
-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_BINARY_DIR}/Release/extensions)
14
14
+
find_package(YAML-CPP 0.6.3 QUIET)
+2
-2
pkgs/applications/misc/huggle/default.nix
···
14
14
15
15
stdenv.mkDerivation rec {
16
16
pname = "huggle";
17
17
-
version = "3.4.10";
17
17
+
version = "3.4.12";
18
18
19
19
src = fetchFromGitHub {
20
20
owner = "huggle";
21
21
repo = "huggle3-qt-lx";
22
22
rev = version;
23
23
-
sha256 = "UzoX4kdzYU50W0MUhfpo0HaSfvG3eINNC8u5t/gKuqI=";
23
23
+
sha256 = "scNGmMVZ6z9FTQuZCdwRYk0WP5qKfdb/M9Co8TbiMDE=";
24
24
fetchSubmodules = true;
25
25
};
26
26