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/development/r-modules | |
| 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/development/r-modules')
| -rw-r--r-- | pkgs/development/r-modules/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 2d1c1566185a..a9d81f028f4a 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -235,7 +235,7 @@ let ChemmineOB = [ pkgs.openbabel pkgs.pkgconfig ]; cit = [ pkgs.gsl ]; curl = [ pkgs.curl ]; - devEMF = [ pkgs.xlibs.libXft ]; + devEMF = [ pkgs.xorg.libXft ]; diversitree = [ pkgs.gsl pkgs.fftw ]; EMCluster = [ pkgs.liblapack ]; fftw = [ pkgs.fftw ]; @@ -340,7 +340,7 @@ let TAQMNGR = [ pkgs.zlib ]; tiff = [ pkgs.libtiff ]; TKF = [ pkgs.gsl ]; - tkrplot = [ pkgs.xlibs.libX11 ]; + tkrplot = [ pkgs.xorg.libX11 ]; topicmodels = [ pkgs.gsl ]; udunits2 = [ pkgs.udunits pkgs.expat ]; V8 = [ pkgs.v8 ]; @@ -1632,7 +1632,7 @@ let }); devEMF = old.devEMF.overrideDerivation (attrs: { - NIX_CFLAGS_LINK = "-L${pkgs.xlibs.libXft}/lib -lXft"; + NIX_CFLAGS_LINK = "-L${pkgs.xorg.libXft}/lib -lXft"; }); slfm = old.slfm.overrideDerivation (attrs: { |