colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libunicode: 0.3.0 -> 0.4.0

Browse Source
This commit is contained in:
fortuneteller2k 2023-12-20 06:46:53 +08:00
parent 368dd7d0b2
commit bf0cf6f215
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/libunicode/default.nix
View File

@ -10,15 +10,18 @@ let
};
in stdenv.mkDerivation (final: {
pname = "libunicode";
version = "0.3.0-unstable-2023-03-05";
version = "0.4.0";
src = fetchFromGitHub {
owner = "contour-terminal";
repo = "libunicode";
rev = "65e0c6ddf9648b94aa9bc7dda0718401efa9ef8e";
hash = "sha256-F4CVU5MImkM571mD4iFxqTnNbk2GXKTGksqO4LH2uEk=";
rev = "v${final.version}";
hash = "sha256-Us3T4fnGsArdsVB7IUhwdex43C+H1+lfL8yK9enhf2c=";
};
# Fix: set_target_properties Can not find target to add properties to: Catch2, et al.
patches = [ ./remove-target-properties.diff ];
nativeBuildInputs = [ cmake python3 ];
buildInputs = [ catch2 fmt ];

19
pkgs/development/libraries/libunicode/remove-target-properties.diff Normal file
View File

@ -0,0 +1,19 @@
diff --git a/src/libunicode/CMakeLists.txt b/src/libunicode/CMakeLists.txt
index 6c5ac20..9fa13a3 100644
--- a/src/libunicode/CMakeLists.txt
+++ b/src/libunicode/CMakeLists.txt
@@ -223,10 +223,10 @@ if(LIBUNICODE_TESTING)
# supress conversion warnings for Catch2
# https://github.com/catchorg/Catch2/issues/2583
# https://github.com/SFML/SFML/blob/e45628e2ebc5843baa3739781276fa85a54d4653/test/CMakeLists.txt#L18-L22
- set_target_properties(Catch2 PROPERTIES COMPILE_OPTIONS "" EXPORT_COMPILE_COMMANDS OFF)
- set_target_properties(Catch2WithMain PROPERTIES EXPORT_COMPILE_COMMANDS OFF)
- get_target_property(CATCH2_INCLUDE_DIRS Catch2 INTERFACE_INCLUDE_DIRECTORIES)
- target_include_directories(Catch2 SYSTEM INTERFACE ${CATCH2_INCLUDE_DIRS})
+ # set_target_properties(Catch2 PROPERTIES COMPILE_OPTIONS "" EXPORT_COMPILE_COMMANDS OFF)
+ # set_target_properties(Catch2WithMain PROPERTIES EXPORT_COMPILE_COMMANDS OFF)
+ # get_target_property(CATCH2_INCLUDE_DIRS Catch2 INTERFACE_INCLUDE_DIRECTORIES)
+ # target_include_directories(Catch2 SYSTEM INTERFACE ${CATCH2_INCLUDE_DIRS})
target_link_libraries(unicode_test unicode Catch2::Catch2WithMain fmt::fmt-header-only)
add_test(unicode_test unicode_test)

6
pkgs/top-level/all-packages.nix
View File

@ -3063,6 +3063,7 @@ with pkgs;
inherit (darwin.apple_sdk_11_0.libs) utmp;
inherit (darwin) sigtool;
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
catch2 = catch2_3;
fmt = fmt_9;
};
@ -23651,7 +23652,10 @@ with pkgs;
libuldaq = callPackage ../development/libraries/libuldaq { };
libunicode = callPackage ../development/libraries/libunicode { fmt = fmt_8; };
libunicode = callPackage ../development/libraries/libunicode {
catch2 = catch2_3;
fmt = fmt_9;
};
libunwind =
if stdenv.isDarwin then darwin.libunwind