diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 11:13:22 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 12:08:24 +0200 |
| commit | 21e3ff658ac2d7b7986169f31550aa5f65bb7635 (patch) | |
| tree | a23f824d60d9aad34473c8828278c0fdba2dc188 /pkgs/os-specific/linux/conky/default.nix | |
| parent | 47ad941fbfe752f679d6bc577d2408f79aee7054 (diff) | |
| download | nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.gz nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.bz2 nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.lz nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.xz nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.zst nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.zip | |
x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs before this set of refactoring. But that config wasn't even used by default.
Diffstat (limited to 'pkgs/os-specific/linux/conky/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/conky/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 60bfe093017..b857d5ece45 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -9,7 +9,7 @@ # optional features with extra dependencies , ncursesSupport ? true , ncurses ? null -, x11Support ? true , x11 ? null +, x11Support ? true , xlibsWrapper ? null , xdamageSupport ? x11Support, libXdamage ? null , imlib2Support ? x11Support, imlib2 ? null @@ -29,7 +29,7 @@ assert ncursesSupport -> ncurses != null; -assert x11Support -> x11 != null; +assert x11Support -> xlibsWrapper != null; assert xdamageSupport -> x11Support && libXdamage != null; assert imlib2Support -> x11Support && imlib2 != null; assert luaSupport -> lua != null; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib cmake ] ++ optional ncursesSupport ncurses - ++ optional x11Support x11 + ++ optional x11Support xlibsWrapper ++ optional xdamageSupport libXdamage ++ optional imlib2Support imlib2 ++ optional luaSupport lua |