diff options
| author | Graham Bennett <graham@grahambennett.org> | 2020-09-22 21:56:46 +0100 |
|---|---|---|
| committer | Doron Behar <doron.behar@gmail.com> | 2020-09-25 09:57:25 +0300 |
| commit | 3a5bcb313e7503569bc2039fe3c325de9023af81 (patch) | |
| tree | e74f2cca4d3b64b03074795c0649496741c7a937 /pkgs/top-level | |
| parent | 52075a824dcbfed49092aeecc7c9d30263ec3f5f (diff) | |
| download | nixpkgs-3a5bcb313e7503569bc2039fe3c325de9023af81.tar nixpkgs-3a5bcb313e7503569bc2039fe3c325de9023af81.tar.gz nixpkgs-3a5bcb313e7503569bc2039fe3c325de9023af81.tar.bz2 nixpkgs-3a5bcb313e7503569bc2039fe3c325de9023af81.tar.lz nixpkgs-3a5bcb313e7503569bc2039fe3c325de9023af81.tar.xz nixpkgs-3a5bcb313e7503569bc2039fe3c325de9023af81.tar.zst nixpkgs-3a5bcb313e7503569bc2039fe3c325de9023af81.zip | |
octave: use qt-5 mkDerivation for wrapQtAppsHook
This is to ensure QT_QPA_PLATFORM_PLUGIN_PATH is set on Darwin.
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d26173596f..459dbc7a591 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10124,14 +10124,16 @@ in octave = callPackage ../development/interpreters/octave { python = python3; + mkDerivation = stdenv.mkDerivation; jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; octave-jit = callPackage ../development/interpreters/octave { python = python3; enableJIT = true; + mkDerivation = stdenv.mkDerivation; 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; enableQt = true; overridePlatforms = ["x86_64-linux" "x86_64-darwin"]; |