swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12873 from ericsagnes/feat/i3

Browse source 
i3: move dependencies to runtime
This commit is contained in:
Domen Kožar 2016-02-08 13:16:11 +00:00
parent 4b183538fe f03ce60bd2
commit 89fa4724f1
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/x11/window-managers/i3.nix
View file

@ -34,6 +34,6 @@ in
''; '';
}]; }];
}; };
environment.systemPackages = with pkgs; [ i3 i3status dmenu ]; environment.systemPackages = with pkgs; [ i3 ];
}; };
} }

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, libstartup_notification, libX11, pcre, libev, yajl , xcbutil, xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl
, xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon , xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon
, xorgserver, xvfb_run }: , xorgserver, xvfb_run, dmenu, i3status }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "i3-${version}"; name = "i3-${version}";
@ -24,6 +24,13 @@ 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