about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBen Darwin <bcdarwin@gmail.com>2020-01-30 11:53:25 -0500
committerBen Darwin <bcdarwin@gmail.com>2020-02-03 10:29:17 -0500
commit3ac3677876f06bcb41eb0df047e473780d13c686 (patch)
tree84ce49fe8d7786f4161b0a19cc3bfb9c7f993b90
parent2118cddc82da367ef71b002f34b05a4c3e513a37 (diff)
downloadnixlib-3ac3677876f06bcb41eb0df047e473780d13c686.tar
nixlib-3ac3677876f06bcb41eb0df047e473780d13c686.tar.gz
nixlib-3ac3677876f06bcb41eb0df047e473780d13c686.tar.bz2
nixlib-3ac3677876f06bcb41eb0df047e473780d13c686.tar.lz
nixlib-3ac3677876f06bcb41eb0df047e473780d13c686.tar.xz
nixlib-3ac3677876f06bcb41eb0df047e473780d13c686.tar.zst
nixlib-3ac3677876f06bcb41eb0df047e473780d13c686.zip
octave: build without qscintilla by default
- qscintilla is used for IDE features in the GUI, which is not built since qt support isn't enabled
- this removes qt from the Octave closure
-rw-r--r--pkgs/top-level/all-packages.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2feb885ba5dd..b7eb16765d04 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9205,6 +9205,7 @@ in
     let
       defaultOctaveOptions = {
         qt = null;
+        qscintilla = null;
         ghostscript = null;
         graphicsmagick = null;
         llvm = null;
@@ -9226,6 +9227,7 @@ in
 
   octaveFull = (lowPrio (octave.override {
     qt = qt4;
+    inherit qscintilla;
     overridePlatforms = ["x86_64-linux" "x86_64-darwin"];
     openblas = if stdenv.isDarwin then openblasCompat else openblas;
   }));