Merge pull request #17685 from matthewbauer/darwin-misc2

Darwin misc. fixes

authored by Daniel Peebles and committed by GitHub 3f337a2b 76223aa4

+162 -49
+2
pkgs/applications/audio/bs1770gain/default.nix
··· 11 11 12 12 buildInputs = [ ffmpeg sox ]; 13 13 14 + NIX_CFLAGS_COMPILE = "-Wno-error"; 15 + 14 16 meta = { 15 17 description = "A audio/video loudness scanner implementing ITU-R BS.1770"; 16 18 license = stdenv.lib.licenses.gpl2Plus;
+5 -1
pkgs/applications/audio/cd-discid/default.nix
··· 1 - { fetchurl, stdenv }: 1 + { fetchurl, stdenv 2 + , IOKit ? null }: 2 3 3 4 stdenv.mkDerivation rec { 4 5 name = "cd-discid-${version}"; ··· 10 11 }; 11 12 12 13 installFlags = "PREFIX=$(out) INSTALL=install"; 14 + 15 + buildInputs = [] 16 + ++ stdenv.lib.optional stdenv.isDarwin [ IOKit ]; 13 17 14 18 meta = with stdenv.lib; { 15 19 homepage = http://linukz.org/cd-discid.shtml;
+2
pkgs/applications/editors/geany/default.nix
··· 12 12 sha256 = "0nha21rbdhl10vdpaq8d5v5fszvggl1xar555pvrnvm2y443ffpp"; 13 13 }; 14 14 15 + NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; 16 + 15 17 buildInputs = [ gtk2 which pkgconfig intltool file ]; 16 18 17 19 doCheck = true;
+3
pkgs/applications/editors/mg/default.nix
··· 12 12 patches = [ ./configure.patch ]; 13 13 patchFlags = "-p0"; 14 14 15 + NIX_CFLAGS_COMPILE = "-Wno-error"; 16 + buildFlags = [ "CC=cc" ]; 17 + 15 18 installPhase = '' 16 19 mkdir -p $out/bin 17 20 cp mg $out/bin
+8 -1
pkgs/applications/graphics/gpicview/default.nix
··· 1 - { stdenv, fetchurl, intltool, pkgconfig, gtk2 }: 1 + { stdenv, fetchurl, intltool, pkgconfig, gtk2, fetchpatch }: 2 2 3 3 stdenv.mkDerivation { 4 4 name = "gpicview-0.2.4"; ··· 7 7 url = "mirror://sourceforge/lxde/gpicview-0.2.4.tar.gz"; 8 8 sha256 = "1svcy1c8bgk0pl12yhyv16h2fl52x5vzzcv57z6qdcv5czgvgglr"; 9 9 }; 10 + 11 + patches = [ 12 + (fetchpatch { 13 + url = "https://raw.githubusercontent.com/nonas/debian-clang/master/buildlogs/gpicview/gpicview-0.2.4/debian/patches/clang_FTBFS_Wreturn-type.patch"; 14 + sha256 = "02dm966bplnv10knpdx7rlpjipk884156ggd9ij05zhza0jl8xcs"; 15 + }) 16 + ]; 10 17 11 18 meta = with stdenv.lib; { 12 19 description = "A simple and fast image viewer for X";
+4 -2
pkgs/applications/misc/gkrellm/default.nix
··· 1 - { fetchurl, stdenv, gettext, pkgconfig, glib, gtk, libX11, libSM, libICE }: 1 + { fetchurl, stdenv, gettext, pkgconfig, glib, gtk, libX11, libSM, libICE 2 + , IOKit ? null }: 2 3 3 4 stdenv.mkDerivation rec { 4 5 name = "gkrellm-2.3.5"; ··· 7 8 sha256 = "12rc6zaa7kb60b9744lbrlfkxxfniprm6x0mispv63h4kh75navh"; 8 9 }; 9 10 10 - buildInputs = [gettext pkgconfig glib gtk libX11 libSM libICE]; 11 + buildInputs = [gettext pkgconfig glib gtk libX11 libSM libICE] 12 + ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; 11 13 12 14 # Makefiles are patched to fix references to `/usr/X11R6' and to add 13 15 # `-lX11' to make sure libX11's store path is in the RPATH.
+1 -1
pkgs/applications/networking/nload/default.nix
··· 21 21 ''; 22 22 homepage = http://www.roland-riegel.de/nload/index.html; 23 23 license = stdenv.lib.licenses.gpl2; 24 - platforms = stdenv.lib.platforms.unix; 24 + platforms = stdenv.lib.platforms.linux; 25 25 maintainers = [ stdenv.lib.maintainers.devhell ]; 26 26 }; 27 27 }
+1 -1
pkgs/applications/window-managers/i3/blocks-gaps.nix
··· 19 19 homepage = https://github.com/Airblader/i3blocks-gaps; 20 20 license = licenses.gpl3; 21 21 maintainers = [ "carlsverre" ]; 22 - platforms = platforms.all; 22 + platforms = platforms.linux; 23 23 }; 24 24 }
+4 -2
pkgs/development/interpreters/erlang/R16.nix
··· 2 2 , gnused, gawk, makeWrapper 3 3 , odbcSupport ? false, unixODBC ? null 4 4 , wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null 5 - , enableDebugInfo ? false }: 5 + , enableDebugInfo ? false 6 + , Carbon ? null, Cocoa ? null }: 6 7 7 8 assert wxSupport -> mesa != null && wxGTK != null && xorg != null; 8 9 assert odbcSupport -> unixODBC != null; ··· 23 24 buildInputs = 24 25 [ perl gnum4 ncurses openssl makeWrapper 25 26 ] ++ optional wxSupport [ mesa wxGTK xorg.libX11 ] 26 - ++ optional odbcSupport [ unixODBC ]; 27 + ++ optional odbcSupport [ unixODBC ] 28 + ++ optional stdenv.isDarwin [ Carbon Cocoa ]; 27 29 28 30 patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; 29 31
+4 -2
pkgs/development/interpreters/rakudo/default.nix
··· 1 - { stdenv, fetchurl, perl, icu, zlib, gmp, readline }: 1 + { stdenv, fetchurl, perl, icu, zlib, gmp, readline 2 + , CoreServices, ApplicationServices }: 2 3 3 4 stdenv.mkDerivation rec { 4 5 name = "rakudo-star-${version}"; ··· 9 10 sha256 = "0czx7w1chf108mpyps7k7nqq8cbsy1rbb87ajms9xj65l4ywg8ka"; 10 11 }; 11 12 12 - buildInputs = [ icu zlib gmp readline perl ]; 13 + buildInputs = [ icu zlib gmp readline perl ] 14 + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; 13 15 configureScript = "perl ./Configure.pl"; 14 16 configureFlags = 15 17 [ "--backends=moar"
+1 -1
pkgs/development/libraries/boringssl/default.nix
··· 12 12 13 13 buildInputs = [ cmake perl go ]; 14 14 enableParallelBuilding = true; 15 - NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; 15 + NIX_CFLAGS_COMPILE = "-Wno-error"; 16 16 17 17 installPhase = '' 18 18 mkdir -p $out/bin $out/include $out/lib
+8
pkgs/development/libraries/dclxvi/default.nix
··· 12 12 13 13 buildFlags = [ "libdclxvipairing.so" ]; 14 14 15 + patchPhase = '' 16 + substituteInPlace Makefile \ 17 + --replace "gcc" "cc" 18 + '' + stdenv.lib.optionalString stdenv.isDarwin '' 19 + substituteInPlace Makefile \ 20 + --replace "-soname=libdclxvipairing.so" "-install_name,libdclxvipairing.so" 21 + ''; 22 + 15 23 installPhase = '' 16 24 mkdir -p $out/{include,lib} 17 25 find . -name \*.h -exec cp {} $out/include \;
+4 -2
pkgs/development/libraries/fox/default.nix
··· 1 - { stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft }: 1 + { stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft 2 + , CoreServices ? null }: 2 3 3 4 let 4 5 version = "1.7.9"; ··· 12 13 sha256 = "1jb9368xsin3ppdf6979n5s7in3s9klbxqbwcp0z8misjixl7nzg"; 13 14 }; 14 15 15 - buildInputs = [ libpng xlibsWrapper libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]; 16 + buildInputs = [ libpng xlibsWrapper libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ] 17 + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; 16 18 17 19 doCheck = true; 18 20
+4 -2
pkgs/development/libraries/gegl/default.nix
··· 1 1 { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg 2 - , librsvg, pango, gtk, bzip2, intltool }: 2 + , librsvg, pango, gtk, bzip2, intltool 3 + , OpenGL ? null }: 3 4 4 5 stdenv.mkDerivation rec { 5 6 name = "gegl-0.2.0"; ··· 21 22 22 23 NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; 23 24 24 - buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 intltool ]; 25 + buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 intltool ] 26 + ++ stdenv.lib.optional stdenv.isDarwin OpenGL; 25 27 26 28 nativeBuildInputs = [ pkgconfig ]; 27 29
+3 -1
pkgs/development/libraries/glew/1.10.nix
··· 1 - { stdenv, fetchurl, mesa_glu, x11, libXmu, libXi }: 1 + { stdenv, fetchurl, mesa_glu, x11, libXmu, libXi 2 + , AGL ? null }: 2 3 3 4 with stdenv.lib; 4 5 ··· 12 13 13 14 nativeBuildInputs = [ x11 libXmu libXi ]; 14 15 propagatedNativeBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h 16 + buildInputs = [] ++ optionals stdenv.isDarwin [ AGL ]; 15 17 16 18 patchPhase = '' 17 19 sed -i 's|lib64|lib|' config/Makefile.linux
+3 -2
pkgs/development/libraries/libfreefare/default.nix
··· 1 - { stdenv, fetchurl, pkgconfig, libnfc, openssl }: 1 + { stdenv, fetchurl, pkgconfig, libnfc, openssl 2 + , libobjc ? null }: 2 3 3 4 stdenv.mkDerivation rec { 4 5 name = "libfreefare-${version}"; ··· 9 10 sha256 = "0r5wfvwgf35lb1v65wavnwz2wlfyfdims6a9xpslf4lsm4a1v8xz"; 10 11 }; 11 12 12 - buildInputs = [ pkgconfig libnfc openssl ]; 13 + buildInputs = [ pkgconfig libnfc openssl ] ++ stdenv.lib.optional stdenv.isDarwin libobjc; 13 14 14 15 meta = with stdenv.lib; { 15 16 description = "The libfreefare project aims to provide a convenient API for MIFARE card manipulations";
+1 -1
pkgs/development/libraries/libomxil-bellagio/default.nix
··· 15 15 homepage = http://sourceforge.net/projects/omxil/; 16 16 description = "An opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components"; 17 17 license = licenses.lgpl21; 18 - platforms = platforms.all; 18 + platforms = platforms.linux; 19 19 maintainers = with maintainers; [ wkennington ]; 20 20 }; 21 21 }
+2
pkgs/development/libraries/libsecret/default.nix
··· 11 11 sha256 = "1cychxc3ff8fp857iikw0n2s13s2mhw2dn1mr632f7w3sn6vvrww"; 12 12 }; 13 13 14 + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; 15 + 14 16 propagatedBuildInputs = [ glib ]; 15 17 nativeBuildInputs = [ pkgconfig intltool libxslt docbook_xsl ]; 16 18 buildInputs = [ libgcrypt gobjectIntrospection vala_0_32 ];
+4 -1
pkgs/development/libraries/libstatgrab/default.nix
··· 1 - { stdenv, fetchurl }: 1 + { stdenv, fetchurl 2 + , IOKit ? null }: 2 3 3 4 stdenv.mkDerivation rec { 4 5 name = "libstatgrab-0.91"; ··· 7 8 url = "http://ftp.i-scream.org/pub/i-scream/libstatgrab/${name}.tar.gz"; 8 9 sha256 = "1azinx2yzs442ycwq6p15skl3mscmqj7fd5hq7fckhjp92735s83"; 9 10 }; 11 + 12 + buildInputs = [] ++ stdenv.lib.optional stdenv.isDarwin IOKit; 10 13 11 14 meta = with stdenv.lib; { 12 15 homepage = http://www.i-scream.org/libstatgrab/;
+4 -1
pkgs/development/libraries/nspr/default.nix
··· 1 - { stdenv, fetchurl }: 1 + { stdenv, fetchurl 2 + , CoreServices ? null }: 2 3 3 4 let version = "4.12"; in 4 5 ··· 26 27 find $out -name "*.a" -delete 27 28 moveToOutput share "$dev" # just aclocal 28 29 ''; 30 + 31 + buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; 29 32 30 33 enableParallelBuilding = true; 31 34
+1
pkgs/development/libraries/stfl/default.nix
··· 11 11 buildInputs = [ ncurses libiconv ]; 12 12 13 13 buildPhase = '' 14 + sed -i s/gcc/cc/g Makefile 14 15 sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h 15 16 '' + ( stdenv.lib.optionalString stdenv.isDarwin '' 16 17 sed -i 's/LDLIBS += -lncursesw/LDLIBS += -lncursesw -liconv/' Makefile
+1
pkgs/development/tools/analysis/cccc/default.nix
··· 16 16 substituteInPlace install/install.mak --replace /usr/local/bin $out/bin 17 17 substituteInPlace install/install.mak --replace MKDIR=mkdir "MKDIR=mkdir -p" 18 18 ''; 19 + buildFlags = [ "CCC=c++" "LD=c++" ]; 19 20 20 21 meta = { 21 22 description = "C and C++ Code Counter";
+2
pkgs/development/tools/misc/stm32flash/default.nix
··· 8 8 sha256 = "04k631g9lzvp9xr4sw51xpq1g542np61s1l8fpwx9rbsc8m5l0i6"; 9 9 }; 10 10 11 + buildFlags = [ "CC=cc" ]; 12 + 11 13 installPhase = '' 12 14 # Manually copy, make install copies to /usr/local/bin 13 15 mkdir -pv $out/bin/
+1 -1
pkgs/development/tools/misc/tie/default.nix
··· 10 10 }; 11 11 12 12 buildPhase = '' 13 - gcc tie.c -o tie 13 + cc tie.c -o tie 14 14 ''; 15 15 16 16 installPhase = ''
+5
pkgs/misc/sailsd/default.nix
··· 28 28 chmod 755 -R $sourceRoot/libsailing 29 29 ''; 30 30 31 + patchPhase = '' 32 + substituteInPlace Makefile \ 33 + --replace gcc cc 34 + ''; 35 + 31 36 meta = with stdenv.lib; { 32 37 description = "Simulator daemon for autonomous sailing boats"; 33 38 homepage = https://github.com/sails-simulator/sailsd;
+3 -2
pkgs/servers/mqtt/mosquitto/default.nix
··· 1 - { stdenv, fetchurl, openssl, libuuid }: 1 + { stdenv, fetchurl, openssl, libuuid, cmake }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "mosquitto"; ··· 11 11 sha256 = "1imw5ps0cqda41b574k8hgz9gdr8yy58f76fg8gw14pdnvf3l7sr"; 12 12 }; 13 13 14 - buildInputs = [ openssl libuuid ]; 14 + buildInputs = [ openssl libuuid ] 15 + ++ stdenv.lib.optional stdenv.isDarwin cmake; 15 16 16 17 makeFlags = [ 17 18 "DESTDIR=$(out)"
+1 -1
pkgs/tools/X11/runningx/default.nix
··· 16 16 phases = [ "buildPhase" "installPhase" ]; 17 17 18 18 buildPhase = '' 19 - gcc -O2 -o RunningX $(pkg-config --cflags --libs x11) $src 19 + cc -O2 -o RunningX $(pkg-config --cflags --libs x11) $src 20 20 ''; 21 21 22 22 installPhase = ''
+1 -1
pkgs/tools/X11/setroot/default.nix
··· 18 18 buildInputs = [ libX11 imlib2 ] 19 19 ++ stdenv.lib.optional enableXinerama libXinerama; 20 20 21 - buildFlags = if enableXinerama then "xinerama=1" else "xinerama=0"; 21 + buildFlags = "CC=cc " + (if enableXinerama then "xinerama=1" else "xinerama=0"); 22 22 23 23 installFlags = "DESTDIR=$(out) PREFIX="; 24 24
+3 -1
pkgs/tools/filesystems/genromfs/default.nix
··· 10 10 }; 11 11 12 12 postPatch = '' 13 - substituteInPlace Makefile --replace "prefix = /usr" "prefix = $out" 13 + substituteInPlace Makefile \ 14 + --replace "prefix = /usr" "prefix = $out" \ 15 + --replace "gcc" "cc" 14 16 ''; 15 17 16 18 meta = with stdenv.lib; {
+5
pkgs/tools/misc/dumptorrent/default.nix
··· 9 9 sha256 = "073h03bmpfdy15qh37lvppayld2747i4acpyk0pm5nf2raiak0zm"; 10 10 }; 11 11 12 + patchPhase = '' 13 + substituteInPlace Makefile \ 14 + --replace "gcc" "cc" 15 + ''; 16 + 12 17 installPhase = '' 13 18 mkdir -p $out/bin 14 19 cp ./dumptorrent $out/bin
+3 -1
pkgs/tools/misc/fontforge/default.nix
··· 3 3 , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, pango 4 4 , withGTK ? false, gtk2 5 5 , withPython ? true 6 + , Carbon ? null, Cocoa ? null 6 7 }: 7 8 8 9 stdenv.mkDerivation rec { ··· 30 31 python freetype zlib glib libungif libpng libjpeg libtiff libxml2 31 32 pango 32 33 ] 33 - ++ lib.optionals withGTK [ gtk2 ]; 34 + ++ lib.optionals withGTK [ gtk2 ] 35 + ++ lib.optionals (withGTK && stdenv.isDarwin) [ Carbon Cocoa ]; 34 36 35 37 configureFlags = 36 38 lib.optionals (!withPython) [ "--disable-python-scripting" "--disable-python-extension" ]
+2
pkgs/tools/misc/sl/default.nix
··· 13 13 14 14 buildInputs = [ ncurses ]; 15 15 16 + buildFlags = [ "CC=cc" ]; 17 + 16 18 installPhase = '' 17 19 mkdir -p $out/bin $out/share/man/man1 18 20 cp sl $out/bin
+2
pkgs/tools/misc/unclutter/default.nix
··· 9 9 10 10 buildInputs = [xlibsWrapper]; 11 11 12 + buildFlags = [ "CC=cc" ]; 13 + 12 14 installPhase = '' 13 15 mkdir -pv "$out/bin" 14 16 mkdir -pv "$out/share/man/man1"
+1 -1
pkgs/tools/networking/tlsdate/default.nix
··· 46 46 description = "Secure parasitic rdate replacement"; 47 47 homepage = https://github.com/ioerror/tlsdate; 48 48 maintainers = with maintainers; [ tv fpletz ]; 49 - platforms = platforms.allBut [ "darwin" ]; 49 + platforms = platforms.allBut platforms.darwin; 50 50 }; 51 51 }
+4 -2
pkgs/tools/security/pcsclite/default.nix
··· 1 - { stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl, python2 }: 1 + { stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl, python2 2 + , IOKit ? null }: 2 3 3 4 stdenv.mkDerivation rec { 4 5 name = "pcsclite-${version}"; ··· 26 27 ''; 27 28 28 29 nativeBuildInputs = [ pkgconfig perl python2 ]; 29 - buildInputs = stdenv.lib.optionals stdenv.isLinux [ udev dbus_libs ]; 30 + buildInputs = stdenv.lib.optionals stdenv.isLinux [ udev dbus_libs ] 31 + ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; 30 32 31 33 meta = with stdenv.lib; { 32 34 description = "Middleware to access a smart card using SCard API (PC/SC)";
+2
pkgs/tools/security/stricat/default.nix
··· 9 9 sha256 = "1axg8r4g5n5kdqj5013pgck80nni3z172xkg506vz4zx1zcmrm4r"; 10 10 }; 11 11 12 + buildFlags = [ "CC=cc" ]; 13 + 12 14 installPhase = '' 13 15 mkdir -p $out/bin 14 16 mv stricat $out/bin
+5
pkgs/tools/system/dog/default.nix
··· 8 8 sha256 = "3ef25907ec5d1dfb0df94c9388c020b593fbe162d7aaa9bd08f35d2a125af056"; 9 9 }; 10 10 11 + patchPhase = '' 12 + substituteInPlace Makefile \ 13 + --replace "gcc" "cc" 14 + ''; 15 + 11 16 installPhase = '' 12 17 mkdir -p $out/bin 13 18 mkdir -p $out/man/man1
+1 -1
pkgs/tools/system/hardlink/default.nix
··· 14 14 15 15 installPhase = '' 16 16 mkdir -p $out/bin $out/share/man/man1 17 - gcc -O2 hardlink.c -o $out/bin/hardlink 17 + cc -O2 hardlink.c -o $out/bin/hardlink 18 18 mv hardlink.1 $out/share/man/man1/hardlink.1 19 19 ''; 20 20
+4 -1
pkgs/tools/system/smartmontools/default.nix
··· 1 - { stdenv, fetchurl }: 1 + { stdenv, fetchurl 2 + , IOKit ? null }: 2 3 3 4 let 4 5 version = "6.4"; ··· 17 18 url = "mirror://sourceforge/smartmontools/${name}.tar.gz"; 18 19 sha256 = "11bsxcghh7adzdklcslamlynydxb708vfz892d5w7agdq405ddza"; 19 20 }; 21 + 22 + buildInputs = [] ++ stdenv.lib.optional stdenv.isDarwin IOKit; 20 23 21 24 patchPhase = '' 22 25 cp ${driverdb} drivedb.h
+3 -1
pkgs/tools/system/tm/default.nix
··· 6 6 7 7 installPhase=''make install "PREFIX=$out"''; 8 8 9 - patchPhase = ''sed -i 's@/usr/bin/install@install@g' Makefile''; 9 + patchPhase = '' 10 + sed -i 's@/usr/bin/install@install@g ; s/gcc/cc/g' Makefile 11 + ''; 10 12 11 13 crossAttrs = { 12 14 makeFlags = "CC=${stdenv.cross.config}-gcc";
+1 -1
pkgs/tools/system/yeshup/default.nix
··· 18 18 19 19 meta = with stdenv.lib; { 20 20 homepage = https://github.com/RhysU/yeshup; 21 - platforms = platforms.all; 21 + platforms = platforms.linux; 22 22 license = licenses.cc-by-sa-30; # From Stackoverflow answer 23 23 maintainers = with maintainers; [ obadz ]; 24 24 };
+4 -2
pkgs/tools/text/odt2txt/default.nix
··· 1 - { stdenv, fetchurl, zlib }: 1 + { stdenv, fetchurl, zlib, libiconv }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 name = "odt2txt-0.4"; ··· 10 10 11 11 configurePhase="export makeFlags=\"DESTDIR=$out\""; 12 12 13 - buildInputs = [ zlib ]; 13 + buildInputs = [ zlib libiconv ]; 14 + 15 + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv"; 14 16 15 17 meta = { 16 18 description = "Simple .odt to .txt converter";
+4 -1
pkgs/tools/text/unrtf/default.nix
··· 1 - { stdenv, fetchurl, autoconf, automake }: 1 + { stdenv, fetchurl, autoconf, automake, libiconv }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 name = "unrtf-${version}"; ··· 10 10 }; 11 11 12 12 nativeBuildInputs = [ autoconf automake ]; 13 + 14 + buildInputs = [ ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; 15 + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv"; 13 16 14 17 preConfigure = "./bootstrap"; 15 18
+35 -11
pkgs/top-level/all-packages.nix
··· 1607 1607 fontforge = lowPrio (callPackage ../tools/misc/fontforge { }); 1608 1608 fontforge-gtk = callPackage ../tools/misc/fontforge { 1609 1609 withGTK = true; 1610 + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; 1610 1611 }; 1611 1612 1612 1613 fontmatrix = callPackage ../applications/graphics/fontmatrix {}; ··· 1619 1620 1620 1621 fox = callPackage ../development/libraries/fox/default.nix { 1621 1622 libpng = libpng12; 1623 + inherit (darwin.apple_sdk.frameworks) CoreServices; 1622 1624 }; 1623 1625 1624 1626 fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix { }; ··· 3022 3024 3023 3025 pciutils = callPackage ../tools/system/pciutils { }; 3024 3026 3025 - pcsclite = callPackage ../tools/security/pcsclite { }; 3027 + pcsclite = callPackage ../tools/security/pcsclite { 3028 + inherit (darwin.apple_sdk.frameworks) IOKit; 3029 + }; 3026 3030 3027 3031 pcsctools = callPackage ../tools/security/pcsctools { 3028 3032 inherit (perlPackages) pcscperl Glib Gtk2 Pango; ··· 3497 3501 3498 3502 slsnif = callPackage ../tools/misc/slsnif { }; 3499 3503 3500 - smartmontools = callPackage ../tools/system/smartmontools { }; 3504 + smartmontools = callPackage ../tools/system/smartmontools { 3505 + inherit (darwin.apple_sdk.frameworks) IOKit; 3506 + }; 3501 3507 3502 3508 smbldaptools = callPackage ../tools/networking/smbldaptools { 3503 3509 inherit (perlPackages) NetLDAP CryptSmbHash DigestSHA1; ··· 5676 5682 5677 5683 clooj = callPackage ../development/interpreters/clojure/clooj.nix { }; 5678 5684 5679 - erlangR16 = callPackage ../development/interpreters/erlang/R16.nix { }; 5685 + erlangR16 = callPackage ../development/interpreters/erlang/R16.nix { 5686 + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; 5687 + }; 5680 5688 erlangR16_odbc = callPackage ../development/interpreters/erlang/R16.nix { odbcSupport = true; }; 5681 5689 erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { 5682 5690 inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; ··· 5962 5970 5963 5971 racket = callPackage ../development/interpreters/racket { }; 5964 5972 5965 - rakudo = callPackage ../development/interpreters/rakudo { }; 5973 + rakudo = callPackage ../development/interpreters/rakudo { 5974 + inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; 5975 + }; 5966 5976 5967 5977 rascal = callPackage ../development/interpreters/rascal { }; 5968 5978 ··· 7317 7327 7318 7328 gephi = callPackage ../applications/science/misc/gephi { }; 7319 7329 7320 - gegl = callPackage ../development/libraries/gegl { }; 7330 + gegl = callPackage ../development/libraries/gegl { 7331 + inherit (darwin.apple_sdk.frameworks) OpenGL; 7332 + }; 7321 7333 7322 7334 gegl_0_3 = callPackage ../development/libraries/gegl/3.0.nix { }; 7323 7335 ··· 7370 7382 gle = callPackage ../development/libraries/gle { }; 7371 7383 7372 7384 glew = callPackage ../development/libraries/glew { }; 7373 - glew110 = callPackage ../development/libraries/glew/1.10.nix { }; 7385 + glew110 = callPackage ../development/libraries/glew/1.10.nix { 7386 + inherit (darwin.apple_sdk.frameworks) AGL; 7387 + }; 7374 7388 7375 7389 glfw = self.glfw3; 7376 7390 glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; ··· 8117 8131 8118 8132 libffi = callPackage ../development/libraries/libffi { }; 8119 8133 8120 - libfreefare = callPackage ../development/libraries/libfreefare { }; 8134 + libfreefare = callPackage ../development/libraries/libfreefare { 8135 + inherit (darwin) libobjc; 8136 + }; 8121 8137 8122 8138 libftdi = callPackage ../development/libraries/libftdi { }; 8123 8139 ··· 8501 8517 8502 8518 libspatialite = callPackage ../development/libraries/libspatialite { }; 8503 8519 8504 - libstatgrab = callPackage ../development/libraries/libstatgrab { }; 8520 + libstatgrab = callPackage ../development/libraries/libstatgrab { 8521 + inherit (darwin.apple_sdk.frameworks) IOKit; 8522 + }; 8505 8523 8506 8524 libsvm = callPackage ../development/libraries/libsvm { }; 8507 8525 ··· 8877 8895 8878 8896 non = callPackage ../applications/audio/non { }; 8879 8897 8880 - nspr = callPackage ../development/libraries/nspr { }; 8898 + nspr = callPackage ../development/libraries/nspr { 8899 + inherit (darwin.apple_sdk.frameworks) CoreServices; 8900 + }; 8881 8901 8882 8902 nss = lowPrio (callPackage ../development/libraries/nss { }); 8883 8903 nssTools = nss.tools; ··· 12496 12516 12497 12517 cbc = callPackage ../applications/science/math/cbc { }; 12498 12518 12499 - cddiscid = callPackage ../applications/audio/cd-discid { }; 12519 + cddiscid = callPackage ../applications/audio/cd-discid { 12520 + inherit (darwin) IOKit; 12521 + }; 12500 12522 12501 12523 cdparanoia = self.cdparanoiaIII; 12502 12524 ··· 13329 13351 13330 13352 svox = callPackage ../applications/audio/svox { }; 13331 13353 13332 - gkrellm = callPackage ../applications/misc/gkrellm { }; 13354 + gkrellm = callPackage ../applications/misc/gkrellm { 13355 + inherit (darwin) IOKit; 13356 + }; 13333 13357 13334 13358 gmu = callPackage ../applications/audio/gmu { }; 13335 13359