public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kdevelop: 5.2.4 -> 5.3.1, bump llvm version used from 3.8 to 7 (#55015)

Browse Source
This commit is contained in:
aanderse 2019-02-02 10:24:06 -05:00 committed by Timo Kaufmann
parent 5463f4d903
commit 0cb74f6f14
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/editors/kdevelop5/kdevelop.nix
View File

@ -9,7 +9,7 @@
let let
pname = "kdevelop"; pname = "kdevelop";
version = "5.2.4"; version = "5.3.1";
qtVersion = "5.${lib.versions.minor qtbase.version}"; qtVersion = "5.${lib.versions.minor qtbase.version}";
in in
mkDerivation rec { mkDerivation rec {
@ -17,7 +17,7 @@ mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
sha256 = "1jbks7nh9rybz4kg152l39hfj2x0p6mjins8x9mz03bbv8jf8gic"; sha256 = "1098ra7qpal6578hsv20kvxc63v47sp85wjhqr5rgzr2fm7jf6fr";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -37,6 +37,12 @@ mkDerivation rec {
shared-mime-info libksysguard konsole kcrash karchive kguiaddons kpurpose 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 = '' postInstall = ''
# The kdevelop! script (shell environment) needs qdbus and kioclient5 in PATH. # The kdevelop! script (shell environment) needs qdbus and kioclient5 in PATH.
wrapProgram "$out/bin/kdevelop!" \ wrapProgram "$out/bin/kdevelop!" \

2
pkgs/top-level/all-packages.nix
View File

@ -17852,7 +17852,7 @@ in
kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix {}; kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix {};
kdevelop = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix { kdevelop = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix {
llvmPackages = llvmPackages_38; llvmPackages = llvmPackages_7;
}; };
keepnote = callPackage ../applications/office/keepnote { }; keepnote = callPackage ../applications/office/keepnote { };