diff options
| author | Lancelot SIX <lsix+github@lancelotsix.com> | 2020-02-03 20:10:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-03 20:10:32 +0100 |
| commit | b07817fbb6ebe94e44aada38d7cab1772c1ab7c2 (patch) | |
| tree | e29eec7aa094342d69d2bd44bf068c34c2d3cb1e | |
| parent | 20f4130a5f08c225e43298ecb6e04efdf2ce16d9 (diff) | |
| parent | 3ac3677876f06bcb41eb0df047e473780d13c686 (diff) | |
| download | nixlib-b07817fbb6ebe94e44aada38d7cab1772c1ab7c2.tar nixlib-b07817fbb6ebe94e44aada38d7cab1772c1ab7c2.tar.gz nixlib-b07817fbb6ebe94e44aada38d7cab1772c1ab7c2.tar.bz2 nixlib-b07817fbb6ebe94e44aada38d7cab1772c1ab7c2.tar.lz nixlib-b07817fbb6ebe94e44aada38d7cab1772c1ab7c2.tar.xz nixlib-b07817fbb6ebe94e44aada38d7cab1772c1ab7c2.tar.zst nixlib-b07817fbb6ebe94e44aada38d7cab1772c1ab7c2.zip | |
Merge pull request #79161 from bcdarwin/octave-disable-qscintilla
octave: build without qscintilla by default
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70bdb872e34b..269e69bf529c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9178,6 +9178,7 @@ in let defaultOctaveOptions = { qt = null; + qscintilla = null; ghostscript = null; graphicsmagick = null; llvm = null; @@ -9199,6 +9200,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; })); |