nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-18 01:54:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

octave: use qt-5 mkDerivation for wrapQtAppsHook

Browse Source 
This is to ensure QT_QPA_PLATFORM_PLUGIN_PATH is set on Darwin.
This commit is contained in:
Graham Bennett 2020-09-22 21:56:46 +01:00 committed by Doron Behar
parent 52075a824d
commit 3a5bcb313e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/interpreters/octave/default.nix
View File

@ -1,4 +1,7 @@
{ stdenv { stdenv
# Note: either stdenv.mkDerivation or, for octaveFull, the qt-5 mkDerivation
# with wrapQtAppsHook (comes from libsForQt5.callPackage)
, mkDerivation
, fetchurl , fetchurl
, gfortran , gfortran
, ncurses , ncurses
@ -55,7 +58,7 @@
assert (!blas.isILP64) && (!lapack.isILP64); assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec { mkDerivation rec {
version = "5.2.0"; version = "5.2.0";
pname = "octave"; pname = "octave";

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

@ -10124,14 +10124,16 @@ in
octave = callPackage ../development/interpreters/octave { octave = callPackage ../development/interpreters/octave {
python = python3; python = python3;
mkDerivation = stdenv.mkDerivation;
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
}; };
octave-jit = callPackage ../development/interpreters/octave { octave-jit = callPackage ../development/interpreters/octave {
python = python3; python = python3;
enableJIT = true; enableJIT = true;
mkDerivation = stdenv.mkDerivation;
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
}; };
octaveFull = (lowPrio (libsForQt512.callPackage ../development/interpreters/octave { octaveFull = (lowPrio (libsForQt5.callPackage ../development/interpreters/octave {
python = python3; python = python3;
enableQt = true; enableQt = true;
overridePlatforms = ["x86_64-linux" "x86_64-darwin"]; overridePlatforms = ["x86_64-linux" "x86_64-darwin"];