Move konversation to pkgs
svn path=/nixpkgs/trunk/; revision=23330
This commit is contained in:
parent
608cde4f82
commit
682e4ae09e
4 changed files with 29 additions and 23 deletions
25
pkgs/applications/networking/irc/konversation/default.nix
Normal file
25
pkgs/applications/networking/irc/konversation/default.nix
Normal file
|
@ -0,0 +1,25 @@
|
|||
{ stdenv, fetchurl, cmake, qt4, perl, gettext, libXScrnSaver
|
||||
, kdelibs, kdepimlibs, automoc4, phonon, qca2}:
|
||||
|
||||
let
|
||||
pn = "konversation";
|
||||
v = "1.3.1";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pn}-${v}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/${pn}/${v}/src/${name}.tar.bz2";
|
||||
sha256 = "0wigcvi6lscy14dhm5nh1mkhfx7xxdq9g163pwpd0xndvybrfhfl";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake qt4 perl gettext libXScrnSaver kdelibs kdepimlibs
|
||||
automoc4 phonon qca2 ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Integrated IRC client for KDE";
|
||||
license = "GPL";
|
||||
inherit (kdelibs.meta) maintainers platforms;
|
||||
};
|
||||
}
|
|
@ -296,12 +296,7 @@ pkgs.recurseIntoAttrs (rec {
|
|||
inherit automoc4 phonon qca2;
|
||||
};
|
||||
|
||||
konversation = import ./extragear/konversation {
|
||||
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext;
|
||||
inherit (pkgs.xlibs) libXScrnSaver;
|
||||
inherit kdelibs kdepimlibs;
|
||||
inherit automoc4 phonon qca2;
|
||||
};
|
||||
inherit (pkgs) konversation;
|
||||
|
||||
gtk_qt_engine = import ./extragear/gtk-qt-engine {
|
||||
inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext;
|
||||
|
|
|
@ -1,16 +0,0 @@
|
|||
{ stdenv, fetchurl, lib, cmake, qt4, perl, gettext, libXScrnSaver
|
||||
, kdelibs, kdepimlibs, automoc4, phonon, qca2}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "konversation-1.3";
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/konversation/1.3/src/konversation-1.3.tar.bz2;
|
||||
sha256 = "05gs75j4qza7i7yydy7rcqhp70r6zblbai5k1fygyhsd23ryqq9n";
|
||||
};
|
||||
buildInputs = [ cmake qt4 perl gettext stdenv.gcc.libc libXScrnSaver kdelibs kdepimlibs automoc4 phonon qca2 ];
|
||||
meta = {
|
||||
description = "Integrated IRC client for KDE";
|
||||
license = "GPL";
|
||||
maintainers = [ lib.maintainers.sander ];
|
||||
};
|
||||
}
|
|
@ -3252,7 +3252,7 @@ let
|
|||
useGTK = getPkgConfig "libiodbc" "gtk" false;
|
||||
};
|
||||
|
||||
libktorrent = newScope pkgs.kde45 ../development/libraries/libktorrent { };
|
||||
libktorrent = newScope pkgs.kde4 ../development/libraries/libktorrent { };
|
||||
|
||||
liblqr1 = callPackage ../development/libraries/liblqr-1 {
|
||||
inherit (gnome) glib;
|
||||
|
@ -5729,6 +5729,8 @@ let
|
|||
# inherit ffmpeg2theora sox, vorbis-tools lame mjpegtools dvdauthor 'Q'dvdauthor growisofs mencoder;
|
||||
};
|
||||
|
||||
konversation = newScope pkgs.kde4 ../applications/networking/irc/konversation { };
|
||||
|
||||
lame = callPackage ../applications/audio/lame { };
|
||||
|
||||
larswm = callPackage ../applications/window-managers/larswm { };
|
||||
|
|
Loading…
Reference in a new issue