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

Make kadu build in chroot. TODO: re-enable icons

Browse Source 
svn path=/nixpkgs/trunk/; revision=24064
This commit is contained in:
Yury G. Kudryashov 2010-10-05 05:43:59 +00:00
parent 67b5d732a2
commit 1099a83b54
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/networking/instant-messengers/kadu/default.nix
View File

@ -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 { stdenv.mkDerivation {
@ -10,19 +11,13 @@ stdenv.mkDerivation {
}; };
buildInputs = [ 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"; prePatch = ''
patchShebangs .
patches = [ ./more-icons.patch ];
patchPhase = ''
unset patchPhase; patchPhase
sed 's=/bin/bash=/${stdenv.shell}=g' -i \
`find -type f -name '*.sh' -or -name 'autodownload'`
''; '';
meta = { meta = {

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

@ -5789,12 +5789,8 @@ let
jwm = callPackage ../applications/window-managers/jwm { }; jwm = callPackage ../applications/window-managers/jwm { };
kadu = callPackage ../applications/networking/instant-messengers/kadu { kadu = newScope pkgs.kde45 ../applications/networking/instant-messengers/kadu {
stdenv = stdenv2; 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 { }; kbluetooth = newScope pkgs.kde4 ../tools/bluetooth/kbluetooth { };