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

Revert "i3: add configFile to enable cutom configuration locations"

Browse Source
This commit is contained in:
Graham Christensen 2017-07-02 08:48:41 -04:00 committed by GitHub
parent b084b93faa
commit ed59b2c892
2 changed files with 61 additions and 76 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,13 +1,11 @@
{ 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, symlinkJoin, configFile ? null }: , xorgserver, xvfb_run }:
let stdenv.mkDerivation rec {
version = "4.13";
i3 = stdenv.mkDerivation rec {
name = "i3-${version}"; name = "i3-${version}";
version = "4.13";
src = fetchurl { src = fetchurl {
url = "http://i3wm.org/downloads/${name}.tar.bz2"; url = "http://i3wm.org/downloads/${name}.tar.bz2";
@ -71,15 +69,4 @@ let
''; '';
}; };
};
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

@ -14492,8 +14492,6 @@ 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 { };