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

profanity: Clean up package expression file.

Browse Source 
No real changes in functionality, other than renaming libnotifySupport
to just notifySupport.

I've wrapped the lines to a maximum of 80 characters in width, so the
file looks less cluttered up. Which includes setting apart the attribute
for notifySupport and its respective dependencies from the main
dependencies.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2015-01-05 08:22:32 +01:00
parent 429dd8e884
commit a313780202
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/applications/networking/instant-messengers/profanity/default.nix
View File

@ -1,11 +1,15 @@
{ stdenv, fetchurl, automake, autoconf, pkgconfig, glib, openssl, expat, ncurses, libotr, curl, libstrophe, { stdenv, fetchurl, automake, autoconf, pkgconfig, glib, openssl, expat
libnotifySupport ? false, libnotify ? null, libXScrnSaver ? null, libX11 ? null, gdk_pixbuf ? null}: , ncurses, libotr, curl, libstrophe
assert libnotifySupport -> (libnotify != null && libXScrnSaver != null && libX11 != null && gdk_pixbuf != null); , notifySupport ? false, libnotify ? null, libXScrnSaver ? null
, libX11 ? null, gdk_pixbuf ? null
}:
assert notifySupport -> libnotify != null && libXScrnSaver != null
&& libX11 != null && gdk_pixbuf != null;
with stdenv.lib;
let
optional = stdenv.lib.optional;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "profanity-${version}"; name = "profanity-${version}";
version = "0.4.5"; version = "0.4.5";
@ -15,8 +19,10 @@ stdenv.mkDerivation rec {
sha256 = "0qzwqxcxf695z3gf94psd2x619vlp4hkkjmkrpsla1ns0f6v6dkl"; sha256 = "0qzwqxcxf695z3gf94psd2x619vlp4hkkjmkrpsla1ns0f6v6dkl";
}; };
buildInputs = [ automake autoconf pkgconfig glib openssl expat ncurses libotr curl libstrophe ] buildInputs = [
++ optional libnotifySupport [ libnotify libXScrnSaver libX11 gdk_pixbuf ]; automake autoconf pkgconfig
glib openssl expat ncurses libotr curl libstrophe
] ++ optionals notifySupport [ libnotify libXScrnSaver libX11 gdk_pixbuf ];
preConfigure = "sh bootstrap.sh"; preConfigure = "sh bootstrap.sh";
@ -27,8 +33,8 @@ stdenv.mkDerivation rec {
libstrophe, inspired by Irssi. libstrophe, inspired by Irssi.
''; '';
homepage = http://profanity.im/; homepage = http://profanity.im/;
license = stdenv.lib.licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
maintainers = [ stdenv.lib.maintainers.devhell ]; maintainers = [ maintainers.devhell ];
}; };
} }

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

@ -10580,7 +10580,7 @@ let
procmail = callPackage ../applications/misc/procmail { }; procmail = callPackage ../applications/misc/procmail { };
profanity = callPackage ../applications/networking/instant-messengers/profanity { profanity = callPackage ../applications/networking/instant-messengers/profanity {
libnotifySupport = config.profanity.libnotifySupport or true; notifySupport = config.profanity.notifySupport or true;
}; };
pstree = callPackage ../applications/misc/pstree { }; pstree = callPackage ../applications/misc/pstree { };