Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions pkgs/by-name/bl/blend2d/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,13 @@

stdenv.mkDerivation {
pname = "blend2d";
# Note: this is an outdated version for pdf4qt, but vcpkg also uses it
# See 'Commit Hashes' in https://blend2d.com/download.html for newest
# If the newest version is needed, we can rename this package.
version = "0.10";
version = "0.12";

src = fetchFromGitHub {
owner = "blend2d";
repo = "blend2d";
rev = "452d549751188b04367b5af46c040cb737f5f76c";
hash = "sha256-LDhnXsp/V1A3YqVyjBVaL7/V6Nhts/1E9hRhl2P293o=";
rev = "717cbf4bc0f2ca164cf2f0c48f0497779241b6c5";
hash = "sha256-L3wDsjy0cocncZqKLy8in2yirrFJoqU3tFBfeBxlhs0=";
};

outputs = [
Expand Down
6 changes: 3 additions & 3 deletions pkgs/by-name/pd/pdf4qt/find_lcms2_path.patch
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98752ec..aa029b3 100644
index 298cdca..8894db3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,7 +55,15 @@ endif()
qt_standard_project_setup()

find_package(OpenSSL REQUIRED)
-find_package(lcms REQUIRED)
-find_package(lcms2 REQUIRED)
+SET(LCMS2_NAMES ${LCMS2_NAMES} lcms2 liblcms2 liblcms2_static)
+FIND_LIBRARY(LCMS2_LIBRARY NAMES ${LCMS2_NAMES} )
+FIND_PATH(LCMS2_INCLUDE_DIR lcms2.h)
+add_library(lcms2::lcms2 UNKNOWN IMPORTED)
+set_target_properties(lcms2::lcms2 PROPERTIES
+ IMPORTED_LOCATION ${LCMS2_LIBRARY}
+ INTERFACE_INCLUDE_DIRECTORIES ${LCMS2_INCLUDE_DIR}
+ INTERFACE_COMPILE_DEFINITIONS "HAVE_LCMS2=1;CMS_NO_REGISTER_KEYWORD=1")
+ INTERFACE_COMPILE_DEFINITIONS "HAVE_LCMS2=1;CMS_NO_REGISTER_KEYWORD=1")
+set_property(GLOBAL APPEND PROPERTY INTERNAL_DEPS_PROP lcms2::lcms2)
find_package(ZLIB REQUIRED)
find_package(Freetype REQUIRED)
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/pd/pdf4qt/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@

stdenv.mkDerivation (finalAttrs: {
pname = "pdf4qt";
version = "1.4.0.0";
version = "1.5.0.0";

src = fetchFromGitHub {
owner = "JakubMelka";
repo = "PDF4QT";
rev = "v${finalAttrs.version}";
hash = "sha256-NlIy/C4uHRG5wwXPuqCShe113qhhsQ5jp50zrOLLA2c=";
hash = "sha256-ELdmnOEKFGCtuf240R/0M6r8aPwRQiXurAxrqcCZvOI=";
};

patches = [
Expand Down