Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3b8dd4bee574
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 22da5d02466f
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on May 10, 2017

  1. kdevelop: 5.0.3 -> 5.0.4 (#23788)

    @ambrop72
    ambrop72 committed May 10, 2017
    Copy the full SHA
    5b1b690 View commit details

  2. kdevelop: Fix shell integration (issue 25559)

    @ambrop72
    ambrop72 committed May 10, 2017
    Copy the full SHA
    d77a2cf View commit details

Commits on May 13, 2017

  1. Merge pull request #25692 from ambrop72/kdevelop-shell-1703 

    kdevelop: Fix shell integration, version bump
    Thomas Tuegel authored May 13, 2017
    Copy the full SHA
    22da5d0 View commit details
19 changes: 14 additions & 5 deletions pkgs/applications/editors/kdevelop5/kdevelop.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules, makeQtWrapper
, qtquickcontrols, qtwebkit, qttools
, qtquickcontrols, qtwebkit, qttools, kde-cli-tools
, kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews
, kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor
, threadweaver, kxmlgui, kwindowsystem, grantlee
@@ -9,16 +9,16 @@

let
pname = "kdevelop";
version = "5.0.3";
dirVersion = "5.0.3";
version = "5.0.4";
dirVersion = "5.0.4";

in
stdenv.mkDerivation rec {
name = "${pname}-${version}";

src = fetchurl {
url = "mirror://kde/stable/${pname}/${dirVersion}/src/${name}.tar.xz";
sha256 = "17a58dfc38b853c6c5987084e8973b4f7f5015a6c2c20f94c2a9f96b0c13f601";
sha256 = "191142b2bdb14837c82721fdfeb15e852329f2c4c0d48fd479c57514c3235d55";
};

nativeBuildInputs = [
@@ -36,7 +36,16 @@ stdenv.mkDerivation rec {

postInstall = ''
wrapQtProgram "$out/bin/kdevelop"
wrapProgram "$out/bin/kdevelop!" --prefix PATH ":" "${qttools}/bin"
# The kdevelop! script (shell environment) needs qdbus and kioclient5 in PATH.
wrapProgram "$out/bin/kdevelop!" --prefix PATH ":" "${qttools}/bin:${kde-cli-tools}/bin"
# Fix the (now wrapped) kdevelop! to find things in right places:
# - Make KDEV_BASEDIR point to bin directory of kdevplatform.
kdev_fixup_sed="s|^export KDEV_BASEDIR=.*$|export KDEV_BASEDIR=${kdevplatform}/bin|"
# - Fixup the one use where KDEV_BASEDIR is assumed to contain kdevelop.
kdev_fixup_sed+=";s|\\\$KDEV_BASEDIR/kdevelop|$out/bin/kdevelop|"
sed -E -i "$kdev_fixup_sed" "$out/bin/.kdevelop!-wrapped"
'';

meta = with stdenv.lib; {
55 changes: 0 additions & 55 deletions pkgs/applications/editors/kdevelop5/kdevplatform-projectconfigskeleton.patch
View file

This file was deleted.

8 changes: 3 additions & 5 deletions pkgs/applications/editors/kdevelop5/kdevplatform.nix
View file
Original file line number Diff line number Diff line change
@@ -6,20 +6,18 @@

let
pname = "kdevplatform";
version = "5.0.3";
dirVersion = "5.0.3";
version = "5.0.4";
dirVersion = "5.0.4";

in
stdenv.mkDerivation rec {
name = "${pname}-${version}";

src = fetchurl {
url = "mirror://kde/stable/kdevelop/${dirVersion}/src/${name}.tar.xz";
sha256 = "643d1145e1948af221f9ae148d0a10809f3d89af4b97ff0d6c4d571004f46bd4";
sha256 = "01abfcd71383048d017fe989ccce0e7590010a3975bbe6e161f55ababe2ad471";
};

patches = [ ./kdevplatform-projectconfigskeleton.patch ];

nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules makeQtWrapper ];

propagatedBuildInputs = [ ];