diff options
author | aanderse <aaron@fosslib.net> | 2019-02-02 10:24:06 -0500 |
---|---|---|
committer | Timo Kaufmann <timokau@zoho.com> | 2019-02-02 16:24:06 +0100 |
commit | 0cb74f6f1400bc7550c1d2ab6a7ccb667b489678 (patch) | |
tree | d35f8a2bc9ea48fe1aeb670f126fcd1991a14005 /pkgs/applications/editors/kdevelop5 | |
parent | 5463f4d903d129f928d85163bd3d738d4dcac8d6 (diff) |
kdevelop: 5.2.4 -> 5.3.1, bump llvm version used from 3.8 to 7 (#55015)
Diffstat (limited to 'pkgs/applications/editors/kdevelop5')
-rw-r--r-- | pkgs/applications/editors/kdevelop5/kdevelop.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index f0ac79e2d22c..a35bd14f310c 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -9,7 +9,7 @@ let pname = "kdevelop"; - version = "5.2.4"; + version = "5.3.1"; qtVersion = "5.${lib.versions.minor qtbase.version}"; in mkDerivation rec { @@ -17,7 +17,7 @@ mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "1jbks7nh9rybz4kg152l39hfj2x0p6mjins8x9mz03bbv8jf8gic"; + sha256 = "1098ra7qpal6578hsv20kvxc63v47sp85wjhqr5rgzr2fm7jf6fr"; }; nativeBuildInputs = [ @@ -37,6 +37,12 @@ mkDerivation rec { shared-mime-info libksysguard konsole kcrash karchive kguiaddons kpurpose ]; + # https://cgit.kde.org/kdevelop.git/commit/?id=716372ae2e8dff9c51e94d33443536786e4bd85b + # required as nixos seems to be unable to find CLANG_BUILTIN_DIR + cmakeFlags = [ + "-DCLANG_BUILTIN_DIR=${llvmPackages.clang-unwrapped}/lib/clang/${(builtins.parseDrvName llvmPackages.clang.name).version}/include" + ]; + postInstall = '' # The kdevelop! script (shell environment) needs qdbus and kioclient5 in PATH. wrapProgram "$out/bin/kdevelop!" \ |