ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 15:27:20 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #62752 from matthewbauer/darwin-fixes100

Browse Source 
Fixes for x86_64-darwin failures on Hydra
This commit is contained in:
Matthew Bauer 2019-06-06 09:46:41 -04:00 committed by GitHub
commit d598eca41e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 29 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/graphics/openimageio/default.nix
View File

@ -41,5 +41,6 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.unix;
badPlatforms = [ "x86_64-darwin" ];
};
}

2
pkgs/applications/misc/fsv/default.nix
View File

@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
'';
homepage = https://github.com/mcuelenaere/fsv;
license = licenses.lgpl2;
platforms = platforms.mesaPlatforms;
platforms = platforms.linux;
maintainers = with maintainers; [ rnhmjoj ];
};
}

1
pkgs/applications/science/biology/iv/default.nix
View File

@ -20,6 +20,7 @@ stdenv.mkDerivation rec
break
fi
done
'' + stdenv.lib.optionalString stdenv.isLinux ''
patchelf --add-needed ${libX11}/lib/libX11.so $out/lib/libIVhines.so
'';
meta = with stdenv.lib;

24
pkgs/development/libraries/libdc1394/darwin-fixes.patch
View File

@ -1,24 +0,0 @@
diff -Naur libdc1394-2.2.5-old/dc1394/bayer.c libdc1394-2.2.5-new/dc1394/bayer.c
--- libdc1394-2.2.5-old/dc1394/bayer.c 2016-10-11 02:19:10.000000000 -0400
+++ libdc1394-2.2.5-new/dc1394/bayer.c 2017-03-28 17:59:02.000000000 -0400
@@ -775,7 +775,7 @@
{
uint8_t *outR, *outG, *outB;
register int i, j;
- uint tmp;
+ uint32_t tmp;
int st=sx*sy;
int p;
int sx2=sx<<1;
diff -Naur libdc1394-2.2.5-old/dc1394/macosx/capture.c libdc1394-2.2.5-new/dc1394/macosx/capture.c
--- libdc1394-2.2.5-old/dc1394/macosx/capture.c 2016-12-20 08:10:34.000000000 -0500
+++ libdc1394-2.2.5-new/dc1394/macosx/capture.c 2017-03-28 17:58:38.000000000 -0400
@@ -614,7 +614,7 @@
dc1394video_frame_t * frame_tmp = capture->frames + next;
char ch;
- if(craw->frames==NULL || craw->capture_is_set==0) {
+ if(craw->capture.frames==NULL || craw->capture_is_set==0) {
*frame=NULL;
return DC1394_CAPTURE_IS_NOT_SET;
}

6
pkgs/development/libraries/libdc1394/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, libraw1394,
libusb1, CoreServices }:
{ stdenv, fetchurl, libraw1394
, libusb1, CoreServices }:
stdenv.mkDerivation rec {
name = "libdc1394-${version}";
@ -14,8 +14,6 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional stdenv.isLinux libraw1394
++ stdenv.lib.optional stdenv.isDarwin CoreServices;
patches = stdenv.lib.optional stdenv.isDarwin ./darwin-fixes.patch;
meta = with stdenv.lib; {
homepage = https://sourceforge.net/projects/libdc1394/;
description = "Capture and control API for IIDC compliant cameras";

2
pkgs/development/libraries/libgssglue/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
homepage = http://www.citi.umich.edu/projects/nfsv4/linux/;
description = "Exports a gssapi interface which calls other random gssapi libraries";
license = licenses.bsd3;
platforms = platforms.unix;
platforms = platforms.linux;
maintainers = with maintainers; [ corngood ];
};
}

2
pkgs/development/libraries/libtommath/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ libtool ];
postPatch = ''
substituteInPlace makefile.shared --replace "LT:=glibtool" "LT:=libtool"
substituteInPlace makefile.shared --replace glibtool libtool
substituteInPlace makefile_include.mk --replace "shell arch" "shell uname -m"
'';

5
pkgs/development/libraries/opencv/3.x.nix
View File

@ -31,7 +31,7 @@
, enableDC1394 ? false, libdc1394
, enableDocs ? false, doxygen, graphviz-nox
, cf-private, AVFoundation, Cocoa, QTKit, VideoDecodeAcceleration, bzip2
, cf-private, AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2
}:
let
@ -200,7 +200,7 @@ stdenv.mkDerivation rec {
++ lib.optionals enableTesseract [ tesseract leptonica ]
++ lib.optional enableTbb tbb
++ lib.optional enableCuda cudatoolkit
++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa QTKit VideoDecodeAcceleration bzip2 ]
++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa VideoDecodeAcceleration bzip2 ]
++ lib.optionals enableDocs [ doxygen graphviz-nox ];
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
@ -237,6 +237,7 @@ stdenv.mkDerivation rec {
] ++ lib.optionals stdenv.isDarwin [
"-DWITH_OPENCL=OFF"
"-DWITH_LAPACK=OFF"
"-DBUILD_opencv_videoio=OFF"
] ++ lib.optionals enablePython [
"-DOPENCV_SKIP_PYTHON_LOADER=ON"
];

5
pkgs/development/libraries/opencv/4.x.nix
View File

@ -31,7 +31,7 @@
, enableDC1394 ? false, libdc1394
, enableDocs ? false, doxygen, graphviz-nox
, cf-private, AVFoundation, Cocoa, QTKit, VideoDecodeAcceleration, bzip2
, cf-private, AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2
}:
let
@ -213,7 +213,7 @@ stdenv.mkDerivation rec {
++ lib.optionals enableTesseract [ tesseract leptonica ]
++ lib.optional enableTbb tbb
++ lib.optional enableCuda cudatoolkit
++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa QTKit VideoDecodeAcceleration bzip2 ]
++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa VideoDecodeAcceleration bzip2 ]
++ lib.optionals enableDocs [ doxygen graphviz-nox ];
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
@ -251,6 +251,7 @@ stdenv.mkDerivation rec {
] ++ lib.optionals stdenv.isDarwin [
"-DWITH_OPENCL=OFF"
"-DWITH_LAPACK=OFF"
"-DBUILD_opencv_videoio=OFF"
] ++ lib.optionals enablePython [
"-DOPENCV_SKIP_PYTHON_LOADER=ON"
];

2
pkgs/development/libraries/opencv/default.nix
View File

@ -89,6 +89,6 @@ stdenv.mkDerivation rec {
homepage = https://opencv.org/;
license = licenses.bsd3;
maintainers = with maintainers; [ ];
platforms = platforms.linux ++ platforms.darwin;
platforms = platforms.linux;
};
}

2
pkgs/development/python-modules/cld2-cffi/default.nix
View File

@ -13,7 +13,7 @@ buildPythonPackage rec {
checkInputs = [ nose ];
# gcc doesn't approve of this code, so disable -Werror
NIX_CFLAGS_COMPILE = "-w";
NIX_CFLAGS_COMPILE = [ "-w" ] ++ stdenv.lib.optional stdenv.cc.isClang "-Wno-error=c++11-narrowing";
checkPhase = "nosetests -v";

2
pkgs/development/tools/misc/kconfig-frontends/default.nix
View File

@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
wrapPythonPrograms
'';
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=format-security";
meta = with stdenv.lib; {
description = "Out of Linux tree packaging of the kconfig infrastructure";
longDescription = ''

2
pkgs/servers/sql/mysql/5.5.x.nix
View File

@ -78,6 +78,6 @@ self = stdenv.mkDerivation rec {
artistic1 bsd0 bsd2 bsd3 bsdOriginal
gpl2 lgpl2 lgpl21 mit publicDomain licenses.zlib
];
broken = stdenv.isAarch64;
broken = stdenv.isAarch64 && stdenv.isDarwin;
};
}; in self

2
pkgs/servers/sql/postgresql/default.nix
View File

@ -101,7 +101,7 @@ let
wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin
'';
doCheck = true;
doCheck = !stdenv.isDarwin;
# autodetection doesn't seem to able to find this, but it's there.
checkTarget = "check";

7
pkgs/shells/ksh/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, meson, ninja, fetchFromGitHub, which, python }:
{ stdenv, meson, ninja, fetchFromGitHub, which, python, libiconv }:
stdenv.mkDerivation rec {
name = "ksh-${version}";
@ -13,13 +13,15 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja which python ];
buildInputs = [ libiconv ];
meta = with stdenv.lib; {
description = "KornShell Command And Programming Language";
longDescription = ''
The KornShell language was designed and developed by David G. Korn at
AT&T Bell Laboratories. It is an interactive command language that
provides access to the UNIX system and to many other systems, on the
many different computers and workstations on which it is implemented.
many different computers and workstations on which it is implemented.
'';
homepage = https://github.com/att/ast;
license = licenses.cpl10;
@ -31,4 +33,3 @@ stdenv.mkDerivation rec {
shellPath = "/bin/ksh";
};
}

2
pkgs/tools/misc/slop/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
inherit (src.meta) homepage;
description = "Queries a selection from the user and prints to stdout";
platforms = stdenv.lib.platforms.all;
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.gpl3Plus;
maintainers = with maintainers; [ primeos mbakke ];
};

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

@ -11047,7 +11047,9 @@ in
libkrb5 = krb5.override { type = "lib"; };
kerberos = libkrb5; # TODO: move to aliases.nix
l-smash = callPackage ../development/libraries/l-smash { };
l-smash = callPackage ../development/libraries/l-smash {
stdenv = gccStdenv;
};
languageMachines = recurseIntoAttrs (import ../development/libraries/languagemachines/packages.nix { inherit callPackage; });
@ -12440,7 +12442,7 @@ in
opencv3 = callPackage ../development/libraries/opencv/3.x.nix {
inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration;
inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration;
};
opencv3WithoutCuda = opencv3.override {
@ -12449,7 +12451,7 @@ in
opencv4 = callPackage ../development/libraries/opencv/4.x.nix {
inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration;
inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration;
};
openexr = callPackage ../development/libraries/openexr { };