From b4c5a6f15f2e3744017ddeb6888d86522ae133f5 Mon Sep 17 00:00:00 2001 From: Tomasz Kontusz Date: Thu, 5 Dec 2013 23:29:23 +0100 Subject: [PATCH] Rename quassel packages --- pkgs/applications/networking/irc/quassel/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 6 ++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 44792693b36..9066bfb6c4c 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -4,6 +4,7 @@ , withKDE ? stdenv.isLinux # enable KDE integration , ssl ? true # enable SSL support , previews ? false # enable webpage previews on hovering over URLs +, tag ? "" # tag added to the package name , stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon }: let @@ -11,13 +12,16 @@ let in with stdenv; mkDerivation rec { - name = "quassel-0.9.2"; + version = "0.9.2"; + name = "quassel${tag}-${version}"; src = fetchurl { - url = "http://quassel-irc.org/pub/${name}.tar.bz2"; + url = "http://quassel-irc.org/pub/quassel-${version}.tar.bz2"; sha256 = "1h2kzi4pgfv3qmvhxix9fffdjixs3bsya0i5c18dkh894mh02kgh"; }; + enableParallelBuilding = true; + buildInputs = [ cmake qt4 ] ++ lib.optional withKDE kdelibs ++ lib.optional withKDE automoc4 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e107812ef9a..5151ef5c160 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9709,14 +9709,16 @@ let quassel = callPackage ../applications/networking/irc/quassel { }; - quasselDaemon = appendToName "daemon" (self.quassel.override { + quasselDaemon = (self.quassel.override { monolithic = false; daemon = true; + tag = "-daemon"; }); - quasselClient = appendToName "client" (self.quassel.override { + quasselClient = (self.quassel.override { monolithic = false; client = true; + tag = "-client"; }); rekonq = callPackage ../applications/networking/browsers/rekonq { };