diff options
author | Daniel Peebles <copumpkin@users.noreply.github.com> | 2016-08-24 11:52:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-24 11:52:27 +0200 |
commit | 3f337a2b23eab043fbea3b15796e7002dfa96751 (patch) | |
tree | adabe4dd64a11aedae79bb6e888347ee38a8487a /pkgs/development | |
parent | 76223aa4b2cc7ebda27a93f00829bd447701740a (diff) | |
parent | a6faa04ee45f1466335cfeb28cfa1b897e31a9b7 (diff) | |
download | nixpkgs-3f337a2b23eab043fbea3b15796e7002dfa96751.tar nixpkgs-3f337a2b23eab043fbea3b15796e7002dfa96751.tar.gz nixpkgs-3f337a2b23eab043fbea3b15796e7002dfa96751.tar.bz2 nixpkgs-3f337a2b23eab043fbea3b15796e7002dfa96751.tar.lz nixpkgs-3f337a2b23eab043fbea3b15796e7002dfa96751.tar.xz nixpkgs-3f337a2b23eab043fbea3b15796e7002dfa96751.tar.zst nixpkgs-3f337a2b23eab043fbea3b15796e7002dfa96751.zip |
Merge pull request #17685 from matthewbauer/darwin-misc2
Darwin misc. fixes
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/interpreters/erlang/R16.nix | 6 | ||||
-rw-r--r-- | pkgs/development/interpreters/rakudo/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/boringssl/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/dclxvi/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/fox/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/gegl/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/glew/1.10.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libfreefare/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/libomxil-bellagio/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libsecret/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libstatgrab/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/nspr/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/stfl/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/tools/analysis/cccc/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/tools/misc/stm32flash/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/misc/tie/default.nix | 2 |
16 files changed, 47 insertions, 16 deletions
diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix index ffc4c27e662..02f9d1f98e8 100644 --- a/pkgs/development/interpreters/erlang/R16.nix +++ b/pkgs/development/interpreters/erlang/R16.nix @@ -2,7 +2,8 @@ , gnused, gawk, makeWrapper , odbcSupport ? false, unixODBC ? null , wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null -, enableDebugInfo ? false }: +, enableDebugInfo ? false +, Carbon ? null, Cocoa ? null }: assert wxSupport -> mesa != null && wxGTK != null && xorg != null; assert odbcSupport -> unixODBC != null; @@ -23,7 +24,8 @@ stdenv.mkDerivation rec { buildInputs = [ perl gnum4 ncurses openssl makeWrapper ] ++ optional wxSupport [ mesa wxGTK xorg.libX11 ] - ++ optional odbcSupport [ unixODBC ]; + ++ optional odbcSupport [ unixODBC ] + ++ optional stdenv.isDarwin [ Carbon Cocoa ]; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index 51b1bb85be6..210570ad846 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, perl, icu, zlib, gmp, readline }: +{ stdenv, fetchurl, perl, icu, zlib, gmp, readline +, CoreServices, ApplicationServices }: stdenv.mkDerivation rec { name = "rakudo-star-${version}"; @@ -9,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0czx7w1chf108mpyps7k7nqq8cbsy1rbb87ajms9xj65l4ywg8ka"; }; - buildInputs = [ icu zlib gmp readline perl ]; + buildInputs = [ icu zlib gmp readline perl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; configureScript = "perl ./Configure.pl"; configureFlags = [ "--backends=moar" diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index 778c368f0f1..3a537821298 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake perl go ]; enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + NIX_CFLAGS_COMPILE = "-Wno-error"; installPhase = '' mkdir -p $out/bin $out/include $out/lib diff --git a/pkgs/development/libraries/dclxvi/default.nix b/pkgs/development/libraries/dclxvi/default.nix index 6207f3d2038..f7d7eee91ed 100644 --- a/pkgs/development/libraries/dclxvi/default.nix +++ b/pkgs/development/libraries/dclxvi/default.nix @@ -12,6 +12,14 @@ stdenv.mkDerivation { buildFlags = [ "libdclxvipairing.so" ]; + patchPhase = '' + substituteInPlace Makefile \ + --replace "gcc" "cc" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile \ + --replace "-soname=libdclxvipairing.so" "-install_name,libdclxvipairing.so" + ''; + installPhase = '' mkdir -p $out/{include,lib} find . -name \*.h -exec cp {} $out/include \; diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 2d44444ab40..78c8b864529 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft }: +{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft +, CoreServices ? null }: let version = "1.7.9"; @@ -12,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1jb9368xsin3ppdf6979n5s7in3s9klbxqbwcp0z8misjixl7nzg"; }; - buildInputs = [ libpng xlibsWrapper libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]; + buildInputs = [ libpng xlibsWrapper libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ] + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; doCheck = true; diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index 70b731f56dd..b54b3a38e76 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg -, librsvg, pango, gtk, bzip2, intltool }: +, librsvg, pango, gtk, bzip2, intltool +, OpenGL ? null }: stdenv.mkDerivation rec { name = "gegl-0.2.0"; @@ -21,7 +22,8 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; - buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 intltool ]; + buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 intltool ] + ++ stdenv.lib.optional stdenv.isDarwin OpenGL; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index 8f153baf6cd..9d5ded5be15 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, mesa_glu, x11, libXmu, libXi }: +{ stdenv, fetchurl, mesa_glu, x11, libXmu, libXi +, AGL ? null }: with stdenv.lib; @@ -12,6 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ x11 libXmu libXi ]; propagatedNativeBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h + buildInputs = [] ++ optionals stdenv.isDarwin [ AGL ]; patchPhase = '' sed -i 's|lib64|lib|' config/Makefile.linux diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/development/libraries/libfreefare/default.nix index 8c485fef47c..291f20a5db2 100644 --- a/pkgs/development/libraries/libfreefare/default.nix +++ b/pkgs/development/libraries/libfreefare/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, libnfc, openssl }: +{ stdenv, fetchurl, pkgconfig, libnfc, openssl +, libobjc ? null }: stdenv.mkDerivation rec { name = "libfreefare-${version}"; @@ -9,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0r5wfvwgf35lb1v65wavnwz2wlfyfdims6a9xpslf4lsm4a1v8xz"; }; - buildInputs = [ pkgconfig libnfc openssl ]; + buildInputs = [ pkgconfig libnfc openssl ] ++ stdenv.lib.optional stdenv.isDarwin libobjc; meta = with stdenv.lib; { description = "The libfreefare project aims to provide a convenient API for MIFARE card manipulations"; diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix index 24e46c0802b..6328494c17e 100644 --- a/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { homepage = http://sourceforge.net/projects/omxil/; description = "An opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components"; license = licenses.lgpl21; - platforms = platforms.all; + platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index adc76640dde..5aedc0df2b9 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1cychxc3ff8fp857iikw0n2s13s2mhw2dn1mr632f7w3sn6vvrww"; }; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + propagatedBuildInputs = [ glib ]; nativeBuildInputs = [ pkgconfig intltool libxslt docbook_xsl ]; buildInputs = [ libgcrypt gobjectIntrospection vala_0_32 ]; diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix index 8ffb8f8bde9..036bb806f68 100644 --- a/pkgs/development/libraries/libstatgrab/default.nix +++ b/pkgs/development/libraries/libstatgrab/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl +, IOKit ? null }: stdenv.mkDerivation rec { name = "libstatgrab-0.91"; @@ -8,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1azinx2yzs442ycwq6p15skl3mscmqj7fd5hq7fckhjp92735s83"; }; + buildInputs = [] ++ stdenv.lib.optional stdenv.isDarwin IOKit; + meta = with stdenv.lib; { homepage = http://www.i-scream.org/libstatgrab/; description = "A library that provides cross platforms access to statistics about the running system"; diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 23f7ffb0ce8..e8ba9c7ec54 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl +, CoreServices ? null }: let version = "4.12"; in @@ -27,6 +28,8 @@ stdenv.mkDerivation { moveToOutput share "$dev" # just aclocal ''; + buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; + enableParallelBuilding = true; meta = { diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix index 4e24268314e..1430c3aa9c2 100644 --- a/pkgs/development/libraries/stfl/default.nix +++ b/pkgs/development/libraries/stfl/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libiconv ]; buildPhase = '' + sed -i s/gcc/cc/g Makefile sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h '' + ( stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's/LDLIBS += -lncursesw/LDLIBS += -lncursesw -liconv/' Makefile diff --git a/pkgs/development/tools/analysis/cccc/default.nix b/pkgs/development/tools/analysis/cccc/default.nix index c672c7964e7..ea7f6d4f590 100644 --- a/pkgs/development/tools/analysis/cccc/default.nix +++ b/pkgs/development/tools/analysis/cccc/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation { substituteInPlace install/install.mak --replace /usr/local/bin $out/bin substituteInPlace install/install.mak --replace MKDIR=mkdir "MKDIR=mkdir -p" ''; + buildFlags = [ "CCC=c++" "LD=c++" ]; meta = { description = "C and C++ Code Counter"; diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix index 6b06bf385b3..f20343156e3 100644 --- a/pkgs/development/tools/misc/stm32flash/default.nix +++ b/pkgs/development/tools/misc/stm32flash/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation { sha256 = "04k631g9lzvp9xr4sw51xpq1g542np61s1l8fpwx9rbsc8m5l0i6"; }; + buildFlags = [ "CC=cc" ]; + installPhase = '' # Manually copy, make install copies to /usr/local/bin mkdir -pv $out/bin/ diff --git a/pkgs/development/tools/misc/tie/default.nix b/pkgs/development/tools/misc/tie/default.nix index 11f2d62b76c..c73dbfce8f8 100644 --- a/pkgs/development/tools/misc/tie/default.nix +++ b/pkgs/development/tools/misc/tie/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildPhase = '' - gcc tie.c -o tie + cc tie.c -o tie ''; installPhase = '' |