for whatever reason -DKBD* was ignored. systmed has --with-kbd-* options which work

This commit is contained in:
Marc Weber 2013-02-03 02:21:40 +01:00 committed by Eelco Dolstra
parent 9670631c75
commit 5784fa5f79

View File

@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
[ "--localstatedir=/var"
"--sysconfdir=/etc"
"--with-rootprefix=$(out)"
"--with-kbd-loadkeys=${kbd}/bin/loadkeys"
"--with-kbd-setfont=${kbd}/bin/setfont"
"--with-rootprefix=$(out)"
"--with-dbusinterfacedir=$(out)/share/dbus-1/interfaces"
"--with-dbuspolicydir=$(out)/etc/dbus-1/system.d"
@ -63,9 +65,7 @@ stdenv.mkDerivation rec {
PYTHON_BINARY = "${coreutils}/bin/env python"; # don't want a build time dependency on Python
NIX_CFLAGS_COMPILE =
[ "-DKBD_LOADKEYS=\"${kbd}/bin/loadkeys\""
"-DKBD_SETFONT=\"${kbd}/bin/setfont\""
# Can't say ${polkit}/bin/pkttyagent here because that would
[ # Can't say ${polkit}/bin/pkttyagent here because that would
# lead to a cyclic dependency.
"-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\""
"-fno-stack-protector"