summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix5
-rw-r--r--pkgs/top-level/guile-2-test.nix7
2 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f1dcba4af5bc..b300f5b1751b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1595,6 +1595,11 @@ let
     inherit fetchurl stdenv ncurses;
   };
 
+  texmacs = import ../applications/office/texmacs {
+    inherit fetchurl stdenv texLive guile;
+    inherit (xlibs) libX11 libXext;
+  };
+
   ttf2pt1 = import ../tools/misc/ttf2pt1 {
     inherit fetchurl stdenv perl freetype;
   };
diff --git a/pkgs/top-level/guile-2-test.nix b/pkgs/top-level/guile-2-test.nix
index 2f221f69c097..7f41a664ab26 100644
--- a/pkgs/top-level/guile-2-test.nix
+++ b/pkgs/top-level/guile-2-test.nix
@@ -45,9 +45,9 @@ let
 in (mapTestOn {
   /* The package list below was obtained with:
 
-     cat top-level/all-packages.nix				\
-     | grep -B3 'guile[^=]*$'					\
-     | grep '^[[:blank:]]*[a-zA-Z0-9_]\+[[:blank:]]*='		\
+     cat top-level/all-packages.nix                             \
+     | grep -B3 'guile[^=]*$'                                   \
+     | grep '^[[:blank:]]*[a-zA-Z0-9_]\+[[:blank:]]*='          \
      | sed -es'/^[[:blank:]]*\(.\+\)[[:blank:]]*=.*$/\1= linux;/g'
 
      with some minor edits.
@@ -60,6 +60,7 @@ in (mapTestOn {
   lsh = linux;
   mailutils = linux;
   mcron = linux;
+  texmacs = linux;
   guileCairo = linux;
   guileGnome = linux;
   guileLib = linux;