alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #66305 from aanderse/kdevelop

Browse source 
kdevelop, kdev-php, kdev-python: 5.3.3 -> 5.4.0
This commit is contained in:
Aaron Andersen 2019-08-13 11:28:11 -04:00 committed by GitHub
parent 2fc0ff34a4 d55fb31fe1
commit 65bf9f4aa5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/editors/kdevelop5/kdev-php.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "kdev-php";
version = "5.3.3";
version = "5.4.0";
src = fetchurl {
url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz";
sha256 = "0nn3yfbi60h7p7p1w2pvgg098qplbds79rk2iadyvhvl3sjd77wf";
sha256 = "1lfl8y1nmai7kp7jil8cykalw2ib0f3n47jvnz7302qsrs3lvhf2";
};
nativeBuildInputs = [ cmake extra-cmake-modules ];

4
pkgs/applications/editors/kdevelop5/kdev-python.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "kdev-python";
version = "5.3.3";
version = "5.4.0";
src = fetchurl {
url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz";
sha256 = "0bqsny2jgi6wi1cz65i2j9r1hiwna2x10mzy7vdk8bz7b4z766yg";
sha256 = "1bsls5gf8jcb5zmswz82x8whfqadpgcapfc8sxvpjv5yhnjknk8c";
};
cmakeFlags = [

14
pkgs/applications/editors/kdevelop5/kdevelop.nix
View file

@ -7,16 +7,13 @@
, libksysguard, konsole, llvmPackages, makeWrapper, kpurpose, boost
}:
let
qtVersion = "5.${lib.versions.minor qtbase.version}";
in
mkDerivation rec {
pname = "kdevelop";
version = "5.3.3";
version = "5.4.0";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
sha256 = "0778587qvi268ab2fgggfl40cv2swgr8q891q1paflp3m1xirpff";
sha256 = "0zi59xlw6facak1jfzlyviwmpjn98dmircmjyqiv3ac5xr30f0ll";
};
nativeBuildInputs = [
@ -44,13 +41,6 @@ mkDerivation rec {
dontWrapQtApps = true;
postPatch = ''
# FIXME: temporary until https://invent.kde.org/kde/kdevelop/merge_requests/8 is merged
substituteInPlace kdevplatform/language/backgroundparser/parsejob.cpp --replace \
'if (internalFilePath.startsWith(dataPath.canonicalPath() + QStringLiteral("/kdev"))) {' \
'if (internalFilePath.startsWith(dataPath.canonicalPath() + QStringLiteral("/kdev")) || localFile.startsWith(path + QStringLiteral("/kdev"))) {'
'';
postInstall = ''
# The kdevelop! script (shell environment) needs qdbus and kioclient5 in PATH.
wrapProgram "$out/bin/kdevelop!" \