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/megaglest | |
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/megaglest')
-rw-r--r-- | pkgs/games/megaglest/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index 2de42fd86ee..059fa74f8be 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, cmake, git, curl, SDL, xercesc, openal, lua , libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng -, fontconfig, freetype, xlibs, makeWrapper, bash, which, gnome3, mesa_glu +, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, mesa_glu , mesa_drivers }: let version = "3.9.2"; lib-env = buildEnv { name = "megaglest-lib-env"; - paths = [ SDL xlibs.libSM xlibs.libICE xlibs.libX11 xlibs.libXext + paths = [ SDL xorg.libSM xorg.libICE xorg.libX11 xorg.libXext xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype stdenv.cc.cc glew mesa_glu mesa_drivers wxGTK ]; }; |