cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

dtkgui: 5.6.10 -> 5.6.17

Browse source
This commit is contained in:
rewine 2023-09-26 12:03:01 +08:00
parent b86462e7b9
commit 7408427db9
No known key found for this signature in database
GPG key ID: 2964FF5514455F51
3 changed files with 52 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pkgs/desktops/deepin/library/dtkgui/default.nix
View file

@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, pkg-config
, cmake
, qttools
@ -17,15 +18,26 @@
stdenv.mkDerivation rec {
pname = "dtkgui";
version = "5.6.10";
version = "5.6.17";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "sha256-4NHt/hLtt99LhWvBX9e5ueB5G86SXx553G6fyHZBXcE=";
hash = "sha256-ssCVMFCE1vhucYMxXkEZV5YlFxT1JdYGqrzILhWX1XI=";
};
patches = [
./fix-pkgconfig-path.patch
./fix-pri-path.patch
(fetchpatch {
name = "fix_svg_with_filter_attribute_rendering_exception.patch";
url = "https://github.com/linuxdeepin/dtkgui/commit/f2c9327eb4989ab8ea96af7560c67d1cada794de.patch";
hash = "sha256-lfg09tgS4vPuYachRbHdaMYKWdZZ0lP0Hxakkr9JKGs=";
})
];
nativeBuildInputs = [
cmake
qttools
@ -48,12 +60,11 @@ stdenv.mkDerivation rec {
];
cmakeFlags = [
"-DDVERSION=${version}"
"-DDTK_VERSION=${version}"
"-DBUILD_DOCS=ON"
"-DQCH_INSTALL_DESTINATION=${qtbase.qtDocPrefix}"
"-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules"
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DCMAKE_INSTALL_INCLUDEDIR=include"
"-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${qtbase.qtDocPrefix}"
"-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "dev"}/libexec"
];
preConfigure = ''
@ -62,6 +73,8 @@ stdenv.mkDerivation rec {
export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix}
'';
outputs = [ "out" "dev" "doc" ];
meta = with lib; {
description = "Deepin Toolkit, gui module for DDE look and feel";
homepage = "https://github.com/linuxdeepin/dtkgui";

16
pkgs/desktops/deepin/library/dtkgui/fix-pkgconfig-path.patch Normal file
View file

@ -0,0 +1,16 @@
diff --git a/misc/dtkgui.pc.in b/misc/dtkgui.pc.in
index 89fdbbf..ad817c4 100644
--- a/misc/dtkgui.pc.in
+++ b/misc/dtkgui.pc.in
@@ -1,8 +1,8 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
-libdir=${prefix}/@LIBRARY_INSTALL_DIR@
-includedir=${prefix}/@INCLUDE_INSTALL_DIR@
-tooldir=${prefix}/@PACKAGE_TOOL_INSTALL_DIR@
+libdir=@LIBRARY_INSTALL_DIR@
+includedir=@INCLUDE_INSTALL_DIR@
+tooldir=@PACKAGE_TOOL_INSTALL_DIR@
Name: dtk@DTK_VERSION_MAJOR@gui
Description: Deepin Tool Kit dtkgui header files

17
pkgs/desktops/deepin/library/dtkgui/fix-pri-path.patch Normal file
View file

@ -0,0 +1,17 @@
diff --git a/misc/qt_lib_dtkgui.pri.in b/misc/qt_lib_dtkgui.pri.in
index 28308ee..9fb25e6 100644
--- a/misc/qt_lib_dtkgui.pri.in
+++ b/misc/qt_lib_dtkgui.pri.in
@@ -4,9 +4,9 @@ QT.dtkgui.MINOR_VERSION = @PROJECT_VERSION_MINOR@
QT.dtkgui.PATCH_VERSION = @PROJECT_VERSION_PATCH@
QT.dtkgui.name = dtkgui
QT.dtkgui.module = dtk@DTK_VERSION_MAJOR@gui
-QT.dtkgui.tools = @CMAKE_INSTALL_PREFIX@/@TOOL_INSTALL_DIR@
-QT.dtkgui.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@
-QT.dtkgui.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@
+QT.dtkgui.tools = @TOOL_INSTALL_DIR@
+QT.dtkgui.libs = @LIBRARY_INSTALL_DIR@
+QT.dtkgui.includes = @INCLUDE_INSTALL_DIR@
QT.dtkgui.frameworks =
QT.dtkgui.depends = core gui dtkcore gui_private dbus network
QT.dtkgui.module_config = v2 internal_module ltcg