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/applications/inferno | |
| parent | 21e3ff658ac2d7b7986169f31550aa5f65bb7635 (diff) | |
| download | nixlib-88c9f8b574ead01e32c5ee5228679723343cd52c.tar nixlib-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.gz nixlib-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.bz2 nixlib-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.lz nixlib-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.xz nixlib-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.zst nixlib-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/applications/inferno')
| -rw-r--r-- | pkgs/applications/inferno/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/inferno/default.nix b/pkgs/applications/inferno/default.nix index 0d61d5635a51..a0e2796a3025 100644 --- a/pkgs/applications/inferno/default.nix +++ b/pkgs/applications/inferno/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchhg, stdenv, xlibs, gcc46, makeWrapper }: +{ fetchurl, fetchhg, stdenv, xorg, gcc46, makeWrapper }: stdenv.mkDerivation rec { # Inferno is a rolling release from a mercurial repository. For the verison number @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; # Fails with gcc48 due to inferno triggering an optimisation issue with floating point. - buildInputs = [ gcc46 xlibs.libX11 xlibs.libXpm xlibs.libXext xlibs.xextproto makeWrapper ]; + buildInputs = [ gcc46 xorg.libX11 xorg.libXpm xorg.libXext xorg.xextproto makeWrapper ]; infernoWrapper = ./inferno; |