public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i3: fix runtime dependencies 

Fixes #25633.
This commit is contained in:
Eric Sagnes 2017-05-10 09:42:44 +09:00 committed by Franz Pletz
parent 9c90ff7e7d
commit 92bb3e8b9b
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nixos/modules/services/x11/window-managers/i3.nix
View File

@ -36,6 +36,21 @@ in
i3 package to use. i3 package to use.
''; '';
}; };
extraPackages = mkOption {
type = with types; listOf package;
default = with pkgs; [ dmenu i3status i3lock ];
example = literalExample ''
with pkgs; [
dmenu
i3status
i3lock
]
'';
description = ''
Extra packages to be installed system wide.
'';
};
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
@ -50,7 +65,7 @@ in
waitPID=$! waitPID=$!
''; '';
}]; }];
environment.systemPackages = [ cfg.package ]; environment.systemPackages = [ cfg.package ] ++ cfg.extraPackages;
}; };
imports = [ imports = [

9
pkgs/applications/window-managers/i3/default.nix
View File

@ -1,7 +1,7 @@
{ fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms { fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms
, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev
, yajl, xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon , yajl, xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon
, xorgserver, xvfb_run, dmenu, i3status }: , xorgserver, xvfb_run }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "i3-${version}"; name = "i3-${version}";
@ -30,13 +30,6 @@ stdenv.mkDerivation rec {
patchShebangs . 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) # Tests have been failing (at least for some people in some cases)
# and have been disabled until someone wants to fix them. Some # and have been disabled until someone wants to fix them. Some
# initial digging uncovers that the tests call out to `git`, which # initial digging uncovers that the tests call out to `git`, which