diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix index a9b5e0d7a86..c35d71fbca0 100644 --- a/pkgs/applications/networking/instant-messengers/kadu/default.nix +++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, cmake, qt, libgadu, bash, libXScrnSaver, libsndfile, qca2, wget, libX11, alsaLib }: +{ stdenv, fetchurl, cmake, qt4, libgadu, libXScrnSaver, libsndfile, qca2 +, libX11, alsaLib }: stdenv.mkDerivation { @@ -10,19 +11,13 @@ stdenv.mkDerivation { }; buildInputs = [ - cmake qt libgadu bash libXScrnSaver libsndfile qca2 wget libX11 alsaLib + cmake qt4 libgadu libXScrnSaver libsndfile qca2 libX11 alsaLib ]; - cmakeFlags = "-Wno-dev"; + cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF"; - NIX_LDFLAGS="-lX11"; - - patches = [ ./more-icons.patch ]; - - patchPhase = '' - unset patchPhase; patchPhase - sed 's=/bin/bash=/${stdenv.shell}=g' -i \ - `find -type f -name '*.sh' -or -name 'autodownload'` + prePatch = '' + patchShebangs . ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98411d086df..6172838474a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5789,12 +5789,8 @@ let jwm = callPackage ../applications/window-managers/jwm { }; - kadu = callPackage ../applications/networking/instant-messengers/kadu { + kadu = newScope pkgs.kde45 ../applications/networking/instant-messengers/kadu { stdenv = stdenv2; - qt = qt4; - inherit fetchurl cmake libgadu bash libsndfile wget alsaLib; - inherit (xlibs) libXScrnSaver libX11; - inherit (kde45) qca2; }; kbluetooth = newScope pkgs.kde4 ../tools/bluetooth/kbluetooth { };