diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 11:26:18 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 12:54:34 +0200 |
| commit | 88c9f8b574ead01e32c5ee5228679723343cd52c (patch) | |
| tree | 92196d2055a7842ae40c022581220bace87ab9e1 /pkgs/games/ue4demos | |
| parent | 21e3ff658ac2d7b7986169f31550aa5f65bb7635 (diff) | |
| download | nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.tar nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.gz nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.bz2 nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.lz nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.xz nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.zst nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.zip | |
xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc. - Avoided renaming local (and different) xlibs binding in gcc*. - Fixed cases where both xorg and xlibs were used. Hopefully everything still works as before.
Diffstat (limited to 'pkgs/games/ue4demos')
| -rw-r--r-- | pkgs/games/ue4demos/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/games/ue4demos/default.nix b/pkgs/games/ue4demos/default.nix index a0e583e1075..ed2ea23d415 100644 --- a/pkgs/games/ue4demos/default.nix +++ b/pkgs/games/ue4demos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, patchelf, xlibs, openal }: +{ stdenv, fetchurl, unzip, patchelf, xorg, openal }: assert stdenv.isLinux; assert stdenv.isx86_64; @@ -11,7 +11,7 @@ let buildInputs = [ unzip patchelf ]; rtdeps = stdenv.lib.makeLibraryPath - [ xlibs.libXxf86vm xlibs.libXext openal ] + [ xorg.libXxf86vm xorg.libXext openal ] + ":" + stdenv.lib.makeSearchPath "lib64" [ stdenv.cc.cc ]; buildCommand = |