3
0
Fork 0
forked from mirrors/nixpkgs

xorg.xinit: fix on Linux after #6160

This commit is contained in:
Vladimír Čunát 2015-02-05 11:09:14 +01:00
parent 18380d2790
commit 1982ac0b65

View file

@ -378,7 +378,7 @@ in
xinit = attrs: attrs // { xinit = attrs: attrs // {
stdenv = if isDarwin then args.clangStdenv else stdenv; stdenv = if isDarwin then args.clangStdenv else stdenv;
buildInputs = if isDarwin then [ args.bootstrap_cmds args.pkgconfig ] else null; buildInputs = attrs.buildInputs ++ lib.optional isDarwin args.bootstrap_cmds;
configureFlags = [ configureFlags = [
"--with-xserver=${xorg.xorgserver}/bin/X" "--with-xserver=${xorg.xorgserver}/bin/X"
] ++ lib.optionals isDarwin [ ] ++ lib.optionals isDarwin [