diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-10-19 07:18:36 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-10-19 07:18:36 -0500 |
| commit | f7de0da188781aea2a4bf2b17e1fbaf8d65925da (patch) | |
| tree | 0a3e9c8a99eefdc2bcf8cd0e89c2c2ec77fe7f94 /pkgs/development | |
| parent | 0b409b37d4aae15c69ee30f0fb2e905f3a437958 (diff) | |
| parent | dae260034cad3ec5d644e798d6e6947f3074c9dc (diff) | |
| download | nixlib-f7de0da188781aea2a4bf2b17e1fbaf8d65925da.tar nixlib-f7de0da188781aea2a4bf2b17e1fbaf8d65925da.tar.gz nixlib-f7de0da188781aea2a4bf2b17e1fbaf8d65925da.tar.bz2 nixlib-f7de0da188781aea2a4bf2b17e1fbaf8d65925da.tar.lz nixlib-f7de0da188781aea2a4bf2b17e1fbaf8d65925da.tar.xz nixlib-f7de0da188781aea2a4bf2b17e1fbaf8d65925da.tar.zst nixlib-f7de0da188781aea2a4bf2b17e1fbaf8d65925da.zip | |
Merge branch 'pull/30305'
plasma5: 5.10.5 -> 5.11.1 sddm: 0.15.0 -> 0.16.0
Diffstat (limited to 'pkgs/development')
4 files changed, 21 insertions, 2 deletions
diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix index 6fae90a8d890..3eed4f0c2e29 100644 --- a/pkgs/development/libraries/grantlee/5/default.nix +++ b/pkgs/development/libraries/grantlee/5/default.nix @@ -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; diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index d5995459fd4f..de99503131c1 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -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 {}; diff --git a/pkgs/development/libraries/kde-frameworks/kirigami2.nix b/pkgs/development/libraries/kde-frameworks/kirigami2.nix new file mode 100644 index 000000000000..f4fc40f6d31d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kirigami2.nix @@ -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" ]; +} diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix index fc5e5d39c63c..ce3f6d157130 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix @@ -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 [ |