mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Code Issues Wiki Activity

Merge pull request #19816 from veprbl/octave_fixes

Browse source 
octave: darwin fix
This commit is contained in:
Daiderd Jordan 2016-11-05 10:49:33 +01:00 committed by GitHub
parent cb6a81c607 5994c12470
commit 3187b01720
5 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/interpreters/octave/default.nix
View file

@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
sha256 = "11y2w6jgngj4rxiy136mkcs02l52rxk60kapyfc4rgrxz5hli3ym";
};
buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11
graphicsmagick pcre pkgconfig mesa fltk zlib curl openblas libsndfile
fftw fftwSinglePrec qrupdate arpack libwebp ]
buildInputs = [ gfortran readline ncurses perl flex texinfo qhull
graphicsmagick pcre pkgconfig fltk zlib curl openblas libsndfile fftw
fftwSinglePrec qrupdate arpack libwebp ]
++ (stdenv.lib.optional (qt != null) qt)
++ (stdenv.lib.optional (qscintilla != null) qscintilla)
++ (stdenv.lib.optional (ghostscript != null) ghostscript)
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
++ (stdenv.lib.optional (jdk != null) jdk)
++ (stdenv.lib.optional (gnuplot != null) gnuplot)
++ (stdenv.lib.optional (python != null) python)
++ (stdenv.lib.optionals (!stdenv.isDarwin) [mesa libX11])
++ (stdenv.lib.optionals (!stdenv.isDarwin) [ mesa libX11 ])
;
doCheck = !stdenv.isDarwin;

2
pkgs/development/libraries/fltk/default.nix
View file

@ -21,6 +21,8 @@ composableDerivation.composableDerivation {} {
--replace 'class Fl_XFont_On_Demand' 'class FL_EXPORT Fl_XFont_On_Demand'
'';
patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ];
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ inputproto ]
++ (if stdenv.isDarwin

20
pkgs/development/libraries/fltk/nsosv.patch Normal file
View file

@ -0,0 +1,20 @@
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 6f5b8b1..2c7763d 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -4074,15 +4074,6 @@ Window fl_xid(const Fl_Window* w)
static int calc_mac_os_version() {
int M, m, b = 0;
NSAutoreleasePool *localPool = [[NSAutoreleasePool alloc] init];
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10
- if ([NSProcessInfo instancesRespondToSelector:@selector(operatingSystemVersion)]) {
- NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion];
- M = version.majorVersion;
- m = version.minorVersion;
- b = version.patchVersion;
- }
- else
-#endif
{
NSDictionary * sv = [NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"];
const char *s = [[sv objectForKey:@"ProductVersion"] UTF8String];

2
pkgs/development/libraries/science/math/openblas/default.nix
View file

@ -54,7 +54,7 @@ stdenv.mkDerivation {
makeFlags =
(if local then localFlags else genericFlags)
++
optionals stdenv.isDarwin ["MACOSX_DEPLOYMENT_TARGET=10.9"]
optionals stdenv.isDarwin ["MACOSX_DEPLOYMENT_TARGET=10.7"]
++
[
"FC=gfortran"

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

@ -5483,7 +5483,7 @@ in
glpk = null;
suitesparse = null;
jdk = null;
openblas = openblas;
openblas = if stdenv.isDarwin then openblasCompat else openblas;
};
octaveFull = (lowPrio (callPackage ../development/interpreters/octave {
qt = qt4;