diff options
| author | Marc Weber <marco-oweber@gmx.de> | 2013-02-03 02:21:40 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-02-04 12:07:37 +0100 |
| commit | 5784fa5f79709b4a87c5d6b2169a0e664536032f (patch) | |
| tree | 76f285d3d0919d41d48b125a5bd959ebb1253999 /pkgs/os-specific/linux/systemd/default.nix | |
| parent | 9670631c75199f2386ee30380a0c5145e7f5d867 (diff) | |
| download | nixpkgs-5784fa5f79709b4a87c5d6b2169a0e664536032f.tar nixpkgs-5784fa5f79709b4a87c5d6b2169a0e664536032f.tar.gz nixpkgs-5784fa5f79709b4a87c5d6b2169a0e664536032f.tar.bz2 nixpkgs-5784fa5f79709b4a87c5d6b2169a0e664536032f.tar.lz nixpkgs-5784fa5f79709b4a87c5d6b2169a0e664536032f.tar.xz nixpkgs-5784fa5f79709b4a87c5d6b2169a0e664536032f.tar.zst nixpkgs-5784fa5f79709b4a87c5d6b2169a0e664536032f.zip | |
for whatever reason -DKBD* was ignored. systmed has --with-kbd-* options which work
Diffstat (limited to 'pkgs/os-specific/linux/systemd/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index e331b86872e..0bf5e8a61dd 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -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" |