mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 23:13:19 +00:00
lomiri.lomiri-action-api: 1.1.2 -> 1.1.3
This commit is contained in:
parent
30cb7f983f
commit
e5ee366c8b
@ -1,7 +1,6 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, gitUpdater
|
||||
, testers
|
||||
, cmake
|
||||
@ -10,17 +9,18 @@
|
||||
, pkg-config
|
||||
, qtbase
|
||||
, qtdeclarative
|
||||
, validatePkgConfig
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lomiri-action-api";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ubports";
|
||||
repo = "development/core/lomiri-action-api";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-FOHjZ5F4IkjSn/SpZEz25CbTR/gaK4D7BRxDVSDuAl8=";
|
||||
hash = "sha256-JDcUq7qEp6Z8TjdNspIz4FE/euH+ytGWa4rSxy4voiU=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@ -28,19 +28,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"dev"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Drop deprecated qt5_use_modules usage
|
||||
# Remove when https://gitlab.com/ubports/development/core/lomiri-action-api/-/merge_requests/4 merged & in release
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/OPNA2608/lomiri-action-api/-/commit/ff1d7f7eb127f6a00a99e8b278c963899d0303f0.patch";
|
||||
hash = "sha256-nLUoRl260hMbtEPjOQJI/3w54xgFxjcxerAqNN5FU/0=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Queries QMake for broken Qt variable: '/build/qtbase-<commit>/$(out)/$(qtQmlPrefix)'
|
||||
substituteInPlace qml/Lomiri/Action/CMakeLists.txt \
|
||||
--replace "\''${QT_IMPORTS_DIR}/Lomiri" '${qtbase.qtQmlPrefix}/Lomiri'
|
||||
--replace 'exec_program(''${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_QML" OUTPUT_VARIABLE QT_IMPORTS_DIR)' 'set(QT_IMPORTS_DIR "''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}")'
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
@ -48,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
validatePkgConfig
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -61,9 +53,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DENABLE_TESTING=${lib.boolToString finalAttrs.finalPackage.doCheck}"
|
||||
"-Duse_libhud2=OFF" # Use vendored libhud2, TODO package libhud2 separately?
|
||||
"-DGENERATE_DOCUMENTATION=OFF" # QML docs need qdoc, https://github.com/NixOS/nixpkgs/pull/245379
|
||||
(lib.cmakeBool "ENABLE_TESTING" finalAttrs.finalPackage.doCheck)
|
||||
# Use vendored libhud2, TODO package libhud2 separately?
|
||||
(lib.cmakeBool "use_libhud2" false)
|
||||
# QML docs need qdoc, https://github.com/NixOS/nixpkgs/pull/245379
|
||||
(lib.cmakeBool "GENERATE_DOCUMENTATION" false)
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
@ -83,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = with lib; {
|
||||
description = "Allow applications to export actions in various forms to the Lomiri Shell";
|
||||
homepage = "https://gitlab.com/ubports/development/core/lomiri-action-api";
|
||||
changelog = "https://gitlab.com/ubports/development/core/lomiri-action-api/-/blob/${finalAttrs.version}/ChangeLog";
|
||||
license = licenses.lgpl3Only;
|
||||
maintainers = teams.lomiri.members;
|
||||
platforms = platforms.linux;
|
||||
|
Loading…
Reference in New Issue
Block a user