summaryrefslogtreecommitdiffstats
path: root/pkgs/development/interpreters/octave
diff options
context:
space:
mode:
authorGraham Bennett <graham@grahambennett.org>2020-09-22 21:56:46 +0100
committerDoron Behar <doron.behar@gmail.com>2020-09-25 09:57:25 +0300
commit3a5bcb313e7503569bc2039fe3c325de9023af81 (patch)
treee74f2cca4d3b64b03074795c0649496741c7a937 /pkgs/development/interpreters/octave
parent52075a824dcbfed49092aeecc7c9d30263ec3f5f (diff)
octave: use qt-5 mkDerivation for wrapQtAppsHook
This is to ensure QT_QPA_PLATFORM_PLUGIN_PATH is set on Darwin.
Diffstat (limited to 'pkgs/development/interpreters/octave')
-rw-r--r--pkgs/development/interpreters/octave/default.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 06d69ed8117f..d9766108596a 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -1,4 +1,7 @@
{ stdenv
+# Note: either stdenv.mkDerivation or, for octaveFull, the qt-5 mkDerivation
+# with wrapQtAppsHook (comes from libsForQt5.callPackage)
+, mkDerivation
, fetchurl
, gfortran
, ncurses
@@ -55,7 +58,7 @@
assert (!blas.isILP64) && (!lapack.isILP64);
-stdenv.mkDerivation rec {
+mkDerivation rec {
version = "5.2.0";
pname = "octave";