tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
kde/gear: adjust some build breakages
André Vitor de Lima Matos
3 years ago
2e19b676
18d5c053
+10
-15
5 changed files
expand all
collapse all
unified
split
pkgs
applications
kde
kaddressbook.nix
kdepim-addons.nix
picmi.nix
pimcommon.nix
skanpage.nix
+3
pkgs/applications/kde/kaddressbook.nix
···
21
21
kdbusaddons ki18n kontactinterface kparts kpimtextedit
22
22
kxmlgui libkdepim libkleo mailcommon pimcommon prison qgpgme qtbase
23
23
];
24
24
+
postInstall = ''
25
25
+
mkdir -p "$out/include/KF5"
26
26
+
'';
24
27
}
+2
-2
pkgs/applications/kde/kdepim-addons.nix
···
5
5
incidenceeditor, kcalendarcore, kcalutils, kconfig, kdbusaddons, kdeclarative,
6
6
kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar,
7
7
libksieve, mailcommon, mailimporter, messagelib, poppler, prison, kpkpass,
8
8
-
kitinerary, kontactinterface
8
8
+
kitinerary, kontactinterface, kaddressbook, discount
9
9
}:
10
10
11
11
mkDerivation {
···
20
20
incidenceeditor kcalendarcore kcalutils kconfig kdbusaddons kdeclarative
21
21
kholidays ki18n kmime ktexteditor ktnef libgravatar
22
22
libksieve mailcommon mailimporter messagelib poppler prison kpkpass
23
23
-
kitinerary kontactinterface
23
23
+
kitinerary kontactinterface kaddressbook discount
24
24
];
25
25
}
+1
-11
pkgs/applications/kde/picmi.nix
···
1
1
-
{ mkDerivation, lib, fetchpatch
1
1
+
{ mkDerivation, lib
2
2
, libkdegames, extra-cmake-modules
3
3
, kdeclarative, knewstuff
4
4
}:
···
15
15
license = licenses.gpl2Plus;
16
16
platforms = platforms.linux;
17
17
};
18
18
-
19
19
-
patches = [
20
20
-
# fix compile error due to usage of deprecated things
21
21
-
# probably can be removed with the next kde bump
22
22
-
(fetchpatch {
23
23
-
url = "https://invent.kde.org/games/picmi/-/commit/99639fb499fe35eb463621efca1c0e4ff2a52bad.patch";
24
24
-
revert = true;
25
25
-
sha256 = "sha256-rRhTvUB1Hpc3bLv9b5yIf/G7uJy2/OgBfXToZwV4jrg=";
26
26
-
})
27
27
-
];
28
18
29
19
nativeBuildInputs = [
30
20
extra-cmake-modules
+2
-2
pkgs/applications/kde/pimcommon.nix
···
16
16
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
17
17
buildInputs = [
18
18
akonadi-mime grantlee karchive kcmutils kcodecs kcompletion kconfigwidgets
19
19
-
kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kldap kpimtextedit
19
19
+
kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kldap
20
20
kpurpose kwallet kwindowsystem libkdepim qtwebengine
21
21
];
22
22
propagatedBuildInputs = [
23
23
-
akonadi akonadi-contacts akonadi-search kconfig kcontacts kimap
23
23
+
akonadi akonadi-contacts akonadi-search kconfig kcontacts kimap kpimtextedit
24
24
];
25
25
outputs = [ "out" "dev" ];
26
26
}
+2
pkgs/applications/kde/skanpage.nix
···
6
6
, ktextwidgets
7
7
, libksane
8
8
, qtquickcontrols2
9
9
+
, kpurpose
9
10
}:
10
11
11
12
mkDerivation rec {
···
18
19
ktextwidgets
19
20
libksane
20
21
qtquickcontrols2
22
22
+
kpurpose
21
23
];
22
24
23
25
meta = with lib; {