Merge branch 'pull/30305'
plasma5: 5.10.5 -> 5.11.1 sddm: 0.15.0 -> 0.16.0
This commit is contained in:
@@ -21,8 +21,12 @@ mkDerivation rec {
|
||||
postFixup =
|
||||
# Disabuse CMake of the notion that libraries are in $dev
|
||||
''
|
||||
sed -i $dev/lib/cmake/Grantlee5/GrantleeTargets-release.cmake \
|
||||
-e "s|\''${_IMPORT_PREFIX}|$out|"
|
||||
for way in release debug; do
|
||||
cmake="$dev/lib/cmake/Grantlee5/GrantleeTargets-$way.cmake"
|
||||
if [ -f "$cmake" ]; then
|
||||
sed -i "$cmake" -e "s|\''${_IMPORT_PREFIX}|$out|"
|
||||
fi
|
||||
done
|
||||
'';
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
@@ -132,6 +132,7 @@ let
|
||||
sonnet = callPackage ./sonnet.nix {};
|
||||
syntax-highlighting = callPackage ./syntax-highlighting.nix {};
|
||||
threadweaver = callPackage ./threadweaver.nix {};
|
||||
kirigami2 = callPackage ./kirigami2.nix {};
|
||||
|
||||
# TIER 2
|
||||
kactivities = callPackage ./kactivities.nix {};
|
||||
|
||||
11
pkgs/development/libraries/kde-frameworks/kirigami2.nix
Normal file
11
pkgs/development/libraries/kde-frameworks/kirigami2.nix
Normal file
@@ -0,0 +1,11 @@
|
||||
{ mkDerivation, extra-cmake-modules, qtbase, qtquickcontrols2, qttranslations }:
|
||||
|
||||
mkDerivation {
|
||||
name = "kirigami2";
|
||||
meta = {
|
||||
broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
|
||||
};
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ qtbase qtquickcontrols2 qttranslations ];
|
||||
outputs = [ "out" "dev" ];
|
||||
}
|
||||
@@ -252,6 +252,9 @@ stdenv.mkDerivation {
|
||||
"-inotify"
|
||||
"-system-libjpeg"
|
||||
"-system-libpng"
|
||||
# gold linker of binutils 2.28 generates duplicate symbols
|
||||
# TODO: remove for newer version of binutils
|
||||
"-no-use-gold-linker"
|
||||
]
|
||||
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
|
||||
Reference in New Issue
Block a user