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/science/math/mathematica | |
| 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/science/math/mathematica')
| -rw-r--r-- | pkgs/applications/science/math/mathematica/9.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/science/math/mathematica/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index c9357d7352f0..b24863a200fd 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -12,7 +12,7 @@ , opencv , openssl , unixODBC -, xlibs +, xorg , zlib }: @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { opencv openssl unixODBC - ] ++ (with xlibs; [ + ] ++ (with xorg; [ libX11 libXext libXtst diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 5fc704178836..331f2db34e2d 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -12,7 +12,7 @@ , opencv , openssl , unixODBC -, xlibs +, xorg , zlib , libxml2 , libuuid @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { unixODBC libxml2 libuuid - ] ++ (with xlibs; [ + ] ++ (with xorg; [ libX11 libXext libXtst |