alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #150178 from andrevmatos/kde/gear

Browse source
This commit is contained in:
Sandro 2021-12-18 06:48:44 +01:00 committed by GitHub
parent 1820bf3660 8bba79606c
commit e0d6a5cce1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 974 additions and 945 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/applications/kde/akonadi/default.nix
View file

@ -36,4 +36,11 @@ mkDerivation {
''-DNIX_OUT=\"${placeholder "out"}\"''
''-I${lib.getDev kio}/include/KF5'' # Fixes: kio_version.h: No such file or directory
];
# compatibility symlinks for kmymoney, can probably be removed in next kde bump
postInstall = ''
ln -s $dev/include/KF5/AkonadiCore/Akonadi/Collection $dev/include/KF5/AkonadiCore/Collection
ln -s $dev/include/KF5/AkonadiCore/Akonadi/ItemFetchScope $dev/include/KF5/AkonadiCore/ItemFetchScope
ln -s $dev/include/KF5/AkonadiCore/Akonadi/RecursiveItemFetchJob $dev/include/KF5/AkonadiCore/RecursiveItemFetchJob
'';
}

2
pkgs/applications/kde/fetch.sh
View file

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/release-service/21.08.3/src -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/release-service/21.12.0/src -A '*.tar.xz' )

12
pkgs/applications/kde/kitinerary.nix
View file

@ -1,6 +1,5 @@
{
mkDerivation, lib, extra-cmake-modules
, qtbase, qtdeclarative, ki18n, kmime, kpkpass
{ mkDerivation, lib, extra-cmake-modules
, qtdeclarative, ki18n, kmime, kpkpass
, poppler, kcontacts, kcalendarcore
, shared-mime-info
}:
@ -16,8 +15,13 @@ mkDerivation {
shared-mime-info # for update-mime-database
];
buildInputs = [
qtbase qtdeclarative ki18n kmime kpkpass poppler
qtdeclarative kmime kpkpass poppler
kcontacts kcalendarcore
];
CXXFLAGS = [
"-I${lib.getDev ki18n}/include/KF5" # Fixes: ki18n_version.h: No such file or directory
];
outputs = [ "out" "dev" ];
}

15
pkgs/applications/kde/krfb.nix
View file

@ -1,10 +1,9 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
kconfig, kcoreaddons, kcrash, kdbusaddons, kdnssd, knotifications, kwallet,
kwidgetsaddons, kwindowsystem, kxmlgui,
libvncserver, libXtst, libXdamage,
qtx11extras
{ mkDerivation, lib
, extra-cmake-modules, kdoctools
, kconfig, kcoreaddons, kcrash, kdbusaddons, kdnssd, knotifications, kwallet
, kwidgetsaddons, kwindowsystem, kxmlgui, kwayland
, libvncserver, libXtst, libXdamage
, qtx11extras
}:
mkDerivation {
@ -19,7 +18,7 @@ mkDerivation {
buildInputs = [
libvncserver libXtst libXdamage
kconfig kcoreaddons kcrash kdbusaddons knotifications kwallet kwidgetsaddons
kwindowsystem kxmlgui
kwindowsystem kxmlgui kwayland
qtx11extras
];
propagatedBuildInputs = [ kdnssd ];

13
pkgs/applications/kde/picmi.nix
View file

@ -1,4 +1,4 @@
{ mkDerivation, lib
{ mkDerivation, lib, fetchpatch
, libkdegames, extra-cmake-modules
, kdeclarative, knewstuff
}:
@ -15,6 +15,17 @@ mkDerivation {
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
patches = [
# fix compile error due to usage of deprecated things
# probably can be removed with the next kde bump
(fetchpatch {
url = "https://invent.kde.org/games/picmi/-/commit/99639fb499fe35eb463621efca1c0e4ff2a52bad.patch";
revert = true;
sha256 = "sha256-rRhTvUB1Hpc3bLv9b5yIf/G7uJy2/OgBfXToZwV4jrg=";
})
];
nativeBuildInputs = [
extra-cmake-modules
];

1840
pkgs/applications/kde/srcs.nix
View file

File diff suppressed because it is too large Load diff

30
pkgs/applications/office/zanshin/default.nix
View file

@ -1,55 +1,31 @@
{ mkDerivation
, lib
, fetchurl
, fetchpatch
, extra-cmake-modules
, qtbase
, boost
, akonadi-calendar
, akonadi-notes
, akonadi-search
, kidentitymanagement
, kontactinterface
, kldap
, krunner
, kwallet
, kcalendarcore
}:
mkDerivation rec {
pname = "zanshin";
version = "0.5.71";
version = "21.12.0";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz";
sha256 = "0b316ddcd46sawva84x5d8nsp19v66gbm83djrra7fv3k8nkv4xh";
url = "mirror://kde/stable/release-service/${version}/src/zanshin-${version}.tar.xz";
sha256 = "sha256-l8W47tS7q747fkSAH3HJdwPsqjMfCyxzl3xJEeAXeh0=";
};
patches = [
# Build with kontactinterface >= 5.14.42.
# Remove after next release.
(fetchpatch {
url = "https://invent.kde.org/pim/zanshin/-/commit/4850c08998b33b37af99c3312d193b063b3e8174.diff";
sha256 = "sha256:0lh0a035alhmws3zyfnkb814drq5cqxvzpwl4g1g5d435gy8k4ps";
})
];
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
qtbase
boost
akonadi-calendar
akonadi-notes
akonadi-search
kidentitymanagement
kontactinterface
kldap
krunner
kwallet
kcalendarcore
];
meta = with lib; {