diff options
| author | adisbladis <adisbladis@gmail.com> | 2018-04-25 09:39:09 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-25 09:39:09 +0800 |
| commit | 7171b60ba56bf483a5e872a73ab51f345d180940 (patch) | |
| tree | 1059e7eb46a50eb5be470c54dd7fb7d8722f938d /pkgs/development | |
| parent | 45f1205bab6650ebb33de392308922703070082e (diff) | |
| parent | a2f617f49f7c256b6baba65d621ef660658733fe (diff) | |
| download | nixlib-7171b60ba56bf483a5e872a73ab51f345d180940.tar nixlib-7171b60ba56bf483a5e872a73ab51f345d180940.tar.gz nixlib-7171b60ba56bf483a5e872a73ab51f345d180940.tar.bz2 nixlib-7171b60ba56bf483a5e872a73ab51f345d180940.tar.lz nixlib-7171b60ba56bf483a5e872a73ab51f345d180940.tar.xz nixlib-7171b60ba56bf483a5e872a73ab51f345d180940.tar.zst nixlib-7171b60ba56bf483a5e872a73ab51f345d180940.zip | |
Merge pull request #39257 from bkchr/kde_applications_18_04
kde_applications: 17.12.3 -> 18.04.0
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks/kholidays.nix | 16 | ||||
| -rw-r--r-- | pkgs/development/tools/analysis/qcachegrind/default.nix | 8 |
3 files changed, 17 insertions, 8 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 08eebfd83aee..f54139836b1d 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -129,6 +129,7 @@ let syntax-highlighting = callPackage ./syntax-highlighting.nix {}; threadweaver = callPackage ./threadweaver.nix {}; kirigami2 = callPackage ./kirigami2.nix {}; + kholidays = callPackage ./kholidays.nix {}; # TIER 2 kactivities = callPackage ./kactivities.nix {}; diff --git a/pkgs/development/libraries/kde-frameworks/kholidays.nix b/pkgs/development/libraries/kde-frameworks/kholidays.nix new file mode 100644 index 000000000000..2ede69e74953 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kholidays.nix @@ -0,0 +1,16 @@ +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + qtbase, qtdeclarative, qttools, +}: + +mkDerivation { + name = "kholidays"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = with lib.maintainers; [ bkchr ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ qtbase qtdeclarative qttools ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix index 15be7554c198..30d82aca83ae 100644 --- a/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -12,14 +12,6 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; - patches = [ - (fetchpatch { - name = "fix-qt5_10-build.patch"; - url = https://github.com/KDE/kcachegrind/commit/c41607a.patch; - sha256 = "00kh5im3hpcarch8rc2dsgxsajfmd8vd7rry9x6mxrbkgr4ifq8y"; - }) - ]; - postInstall = '' mkdir -p $out/bin cp -p converters/dprof2calltree $out/bin/dprof2calltree |