From 84003b70b6a2e38f8445748f38970a048fe8355c Mon Sep 17 00:00:00 2001 From: Alexey Shmalko Date: Sun, 29 May 2016 19:29:02 +0300 Subject: [PATCH] xxkb: Split into multiple outputs I'm also adding myself as a maintainer as I'm the original author of the derivation. --- pkgs/applications/misc/xxkb/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xxkb/default.nix b/pkgs/applications/misc/xxkb/default.nix index 8d46738327ff..6d96278356df 100644 --- a/pkgs/applications/misc/xxkb/default.nix +++ b/pkgs/applications/misc/xxkb/default.nix @@ -18,12 +18,14 @@ stdenv.mkDerivation rec { libX11 libXt libXext libXpm ] ++ stdenv.lib.optional svgSupport [ librsvg glib gdk_pixbuf pkgconfig ]; + outputs = [ "out" "man" ]; + configurePhase = '' xmkmf ${stdenv.lib.optionalString svgSupport "-DWITH_SVG_SUPPORT"} ''; preBuild = '' - makeFlagsArray=( BINDIR=$out/bin PIXMAPDIR=$out/share/xxkb XAPPLOADDIR=$out/etc/X11/app-defaults MANDIR=$out/man ) + makeFlagsArray=( BINDIR=$out/bin PIXMAPDIR=$out/share/xxkb XAPPLOADDIR=$out/etc/X11/app-defaults MANDIR=$man/share/man ) ''; installTargets = "install install.man"; @@ -32,6 +34,7 @@ stdenv.mkDerivation rec { description = "A keyboard layout indicator and switcher"; homepage = "http://xxkb.sourceforge.net/"; license = stdenv.lib.licenses.artistic2; + maintainers = with stdenv.lib.maintainers; [ rasendubi ]; platforms = stdenv.lib.platforms.linux; }; -} \ No newline at end of file +}