public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #79161 from bcdarwin/octave-disable-qscintilla

Browse Source 
octave: build without qscintilla by default
This commit is contained in:
Lancelot SIX 2020-02-03 20:10:32 +01:00 committed by GitHub
commit b07817fbb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/top-level/all-packages.nix
View File

@ -9178,6 +9178,7 @@ in
let let
defaultOctaveOptions = { defaultOctaveOptions = {
qt = null; qt = null;
qscintilla = null;
ghostscript = null; ghostscript = null;
graphicsmagick = null; graphicsmagick = null;
llvm = null; llvm = null;
@ -9199,6 +9200,7 @@ in
octaveFull = (lowPrio (octave.override { octaveFull = (lowPrio (octave.override {
qt = qt4; qt = qt4;
inherit qscintilla;
overridePlatforms = ["x86_64-linux" "x86_64-darwin"]; overridePlatforms = ["x86_64-linux" "x86_64-darwin"];
openblas = if stdenv.isDarwin then openblasCompat else openblas; openblas = if stdenv.isDarwin then openblasCompat else openblas;
})); }));