From b2c658ca1176f8985ea75f10519a5630244b2d87 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Mon, 8 Feb 2016 13:29:42 +0900 Subject: [PATCH 1/2] i3: dmenu and i3status as runtime dependencies --- pkgs/applications/window-managers/i3/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 8cd7932a8d1..0833fde8c9e 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms , xcbutil, xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl , xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon -, xorgserver, xvfb_run }: +, xorgserver, xvfb_run, dmenu, i3status }: stdenv.mkDerivation rec { name = "i3-${version}"; @@ -24,6 +24,13 @@ stdenv.mkDerivation rec { patchShebangs . ''; + postFixup = '' + substituteInPlace $out/etc/i3/config --replace dmenu_run ${dmenu}/bin/dmenu_run + substituteInPlace $out/etc/i3/config --replace "status_command i3status" "status_command ${i3status}/bin/i3status" + substituteInPlace $out/etc/i3/config.keycodes --replace dmenu_run ${dmenu}/bin/dmenu_run + substituteInPlace $out/etc/i3/config.keycodes --replace "status_command i3status" "status_command ${i3status}/bin/i3status" + ''; + # Tests have been failing (at least for some people in some cases) # and have been disabled until someone wants to fix them. Some # initial digging uncovers that the tests call out to `git`, which From f03ce60bd228734ef64c1ae5eaee639332bb1dc2 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Mon, 8 Feb 2016 13:31:03 +0900 Subject: [PATCH 2/2] i3service: remove dmenu and i3 from env packages --- nixos/modules/services/x11/window-managers/i3.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/window-managers/i3.nix b/nixos/modules/services/x11/window-managers/i3.nix index d43dacb1be6..2e2e10cc33b 100644 --- a/nixos/modules/services/x11/window-managers/i3.nix +++ b/nixos/modules/services/x11/window-managers/i3.nix @@ -34,6 +34,6 @@ in ''; }]; }; - environment.systemPackages = with pkgs; [ i3 i3status dmenu ]; + environment.systemPackages = with pkgs; [ i3 ]; }; }