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

x11: replace its usage by xlibsWrapper directly

Browse Source 
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
This commit is contained in:
Vladimír Čunát
2015-09-15 11:13:22 +02:00
parent 47ad941fbf
commit 21e3ff658a
83 changed files with 183 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/conky/default.nix
View File

@@ -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