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

i3: add configFile to enable cutom configuration locations

Browse Source 
i3 loads its configuration from `~/.config/i3`, but in nix-based systems
you might want to build the config in `~/.nix-profile` using a nix
derivation, so `i3` needs to know where to look for the configuration
file.
This commit is contained in:
Maximilian Bosch 2017-06-30 08:11:31 +02:00
parent e11817165f
commit dd4c1e2b01
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
2 changed files with 72 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +1,14 @@
{ 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 }: , xorgserver, xvfb_run, symlinkJoin, configFile ? null }:
stdenv.mkDerivation rec { let
name = "i3-${version}";
version = "4.13"; version = "4.13";
i3 = stdenv.mkDerivation rec {
name = "i3-${version}";
src = fetchurl { src = fetchurl {
url = "http://i3wm.org/downloads/${name}.tar.bz2"; url = "http://i3wm.org/downloads/${name}.tar.bz2";
sha256 = "12ngz32swh9n85xy0cz1lq16aqi9ys5hq19v589q9a97wn1k3hcl"; sha256 = "12ngz32swh9n85xy0cz1lq16aqi9ys5hq19v589q9a97wn1k3hcl";
@ -69,4 +71,15 @@ stdenv.mkDerivation rec {
''; '';
}; };
};
in if configFile == null then i3 else symlinkJoin {
name = "i3-with-config-${version}";
paths = [ i3 ];
buildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram $out/bin/i3 \
--add-flags "-c ${configFile}"
'';
} }

2
pkgs/top-level/all-packages.nix
View File

@ -14483,6 +14483,8 @@ with pkgs;
i3 = callPackage ../applications/window-managers/i3 { i3 = callPackage ../applications/window-managers/i3 {
xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor;
configFile = config.i3.configFile or null;
}; };
i3-gaps = callPackage ../applications/window-managers/i3/gaps.nix { }; i3-gaps = callPackage ../applications/window-managers/i3/gaps.nix { };