diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-27 20:11:15 -0600 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-28 20:14:36 -0600 |
| commit | cf3940ef9582d097cd7fd7c92dc80d4a86f928e6 (patch) | |
| tree | 045ce931ec5a032882ef912d38c2025aa0fae05d /pkgs/applications/misc/xxkb | |
| parent | f5be016c23dd4abb5b5478007484ca7341f84e1e (diff) | |
| download | nixpkgs-cf3940ef9582d097cd7fd7c92dc80d4a86f928e6.tar nixpkgs-cf3940ef9582d097cd7fd7c92dc80d4a86f928e6.tar.gz nixpkgs-cf3940ef9582d097cd7fd7c92dc80d4a86f928e6.tar.bz2 nixpkgs-cf3940ef9582d097cd7fd7c92dc80d4a86f928e6.tar.lz nixpkgs-cf3940ef9582d097cd7fd7c92dc80d4a86f928e6.tar.xz nixpkgs-cf3940ef9582d097cd7fd7c92dc80d4a86f928e6.tar.zst nixpkgs-cf3940ef9582d097cd7fd7c92dc80d4a86f928e6.zip | |
xxkb: use imake setup hook
Diffstat (limited to 'pkgs/applications/misc/xxkb')
| -rw-r--r-- | pkgs/applications/misc/xxkb/default.nix | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/pkgs/applications/misc/xxkb/default.nix b/pkgs/applications/misc/xxkb/default.nix index 90e2723a906..56638d126c1 100644 --- a/pkgs/applications/misc/xxkb/default.nix +++ b/pkgs/applications/misc/xxkb/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, libX11, libXt, libXext, libXpm, imake -, svgSupport ? true, librsvg, glib, gdk_pixbuf, pkgconfig +{ stdenv, fetchurl, libX11, libXt, libXext, libXpm, imake, gccmakedep +, svgSupport ? false, librsvg, glib, gdk_pixbuf, pkgconfig }: assert svgSupport -> @@ -13,20 +13,21 @@ stdenv.mkDerivation rec { sha256 = "0hl1i38z9xnbgfjkaz04vv1n8xbgfg88g5z8fyzyb2hxv2z37anf"; }; + nativeBuildInputs = [ imake gccmakedep ]; buildInputs = [ - imake libX11 libXt libXext libXpm ] ++ stdenv.lib.optionals svgSupport [ librsvg glib gdk_pixbuf pkgconfig ]; outputs = [ "out" "man" ]; - configurePhase = '' - xmkmf ${stdenv.lib.optionalString svgSupport "-DWITH_SVG_SUPPORT"} - ''; + imakeFlags = stdenv.lib.optionalString svgSupport "-DWITH_SVG_SUPPORT"; - preBuild = '' - makeFlagsArray=( BINDIR=$out/bin PIXMAPDIR=$out/share/xxkb XAPPLOADDIR=$out/etc/X11/app-defaults MANDIR=$man/share/man ) - ''; + makeFlags = [ + "BINDIR=${placeholder "out"}/bin" + "PIXMAPDIR=${placeholder "out"}/share/xxkb" + "XAPPLOADDIR=${placeholder "out"}/etc/X11/app-defaults" + "MANDIR=${placeholder "man"}/share/man" + ]; installTargets = "install install.man"; |