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: 680298ef85eb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 43ca91106d7d
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jul 3, 2017

  1. ktorrent: fix build

    @FRidh
    FRidh committed Jul 3, 2017
    Copy the full SHA
    8f5cf68 View commit details

  2. kdevplatform: fix build

    @FRidh
    FRidh committed Jul 3, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    43ca911 View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/applications/editors/kdevelop5/kdevplatform.nix
  2. +2 −2 pkgs/applications/networking/p2p/ktorrent/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/editors/kdevelop5/kdevplatform.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, cmake, gettext, pkgconfig, extra-cmake-modules
, boost, subversion, apr, aprutil
, boost, subversion, apr, aprutil, kwindowsystem
, qtscript, qtwebkit, grantlee, karchive, kconfig, kcoreaddons, kguiaddons, kiconthemes, ki18n
, kitemmodels, kitemviews, kio, kparts, sonnet, kcmutils, knewstuff, knotifications
, knotifyconfig, ktexteditor, threadweaver, kdeclarative, libkomparediff2 }:
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules ];

buildInputs = [
boost subversion apr aprutil
boost subversion apr aprutil kwindowsystem
qtscript qtwebkit grantlee karchive kconfig kcoreaddons kguiaddons kiconthemes
ki18n kitemmodels kitemviews kio kparts sonnet kcmutils knewstuff
knotifications knotifyconfig ktexteditor threadweaver kdeclarative
4 changes: 2 additions & 2 deletions pkgs/applications/networking/p2p/ktorrent/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake
, extra-cmake-modules, qtbase, qtscript
, ki18n, kio, knotifications, knotifyconfig, kdoctools, kross, kcmutils, kdelibs4support
, libktorrent, boost, taglib
, libktorrent, boost, taglib, libgcrypt, kplotting
}:

stdenv.mkDerivation rec {
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ cmake qtbase qtscript
ki18n kio knotifications knotifyconfig kross kcmutils kdelibs4support
libktorrent taglib
libktorrent taglib libgcrypt kplotting
];

enableParallelBuilding = true;