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/applications/window-managers/notion | |
parent | 47ad941fbfe752f679d6bc577d2408f79aee7054 (diff) |
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/applications/window-managers/notion')
-rw-r--r-- | pkgs/applications/window-managers/notion/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix index cd43c06d33e2..2177d1a871f0 100644 --- a/pkgs/applications/window-managers/notion/default.nix +++ b/pkgs/applications/window-managers/notion/default.nix @@ -4,7 +4,7 @@ stdenv, fetchurl, lua, gettext, groff, pkgconfig, busybox, - x11, libXinerama, libXrandr, libX11 + xlibsWrapper, libXinerama, libXrandr, libX11 }: assert enableXft -> libXft != null; @@ -26,7 +26,7 @@ stdenv.mkDerivation { patches = patches ++ stdenv.lib.optional enableXft ./notion-xft_nixos.diff; postPatch = "substituteInPlace system-autodetect.mk --replace '#PRELOAD_MODULES=1' 'PRELOAD_MODULES=1'"; - buildInputs = [x11 lua gettext groff pkgconfig busybox libXinerama libXrandr libX11] ++ stdenv.lib.optional enableXft libXft; + buildInputs = [xlibsWrapper lua gettext groff pkgconfig busybox libXinerama libXrandr libX11] ++ stdenv.lib.optional enableXft libXft; buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}"; installFlags = "PREFIX=\${out}"; |