nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork

Configure Feed

Select the types of activity you want to include in your feed.

fix some packages on darwin

authored by

Eric Seidel and committed by
Joel Taylor
0577499d e2288906

+28 -5
-1
pkgs/development/compilers/llvm/3.4/llvm.nix
··· 65 65 license = stdenv.lib.licenses.bsd3; 66 66 maintainers = with stdenv.lib.maintainers; [ shlevy lovek323 raskin viric ]; 67 67 platforms = stdenv.lib.platforms.all; 68 - # broken = stdenv.isDarwin; 69 68 }; 70 69 }
+2
pkgs/development/compilers/ocaml/4.01.0.nix
··· 26 26 sha256 = "b1ca708994180236917ae79e17606da5bd334ca6acd6873a550027e1c0ec874a"; 27 27 }; 28 28 29 + patches = [ ./fix-clang-build-on-osx.diff ]; 30 + 29 31 prefixKey = "-prefix "; 30 32 configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11lib 31 33 "-x11include" x11inc ];
+20
pkgs/development/compilers/ocaml/fix-clang-build-on-osx.diff
··· 1 + diff --git a/configure b/configure 2 + index d45e88f..25d872b 100755 3 + --- a/configure 4 + +++ b/configure 5 + @@ -322,7 +322,14 @@ case "$bytecc,$target" in 6 + bytecccompopts="-fno-defer-pop $gcc_warnings -DSHRINKED_GNUC" 7 + mathlib="";; 8 + *,*-*-darwin*) 9 + - bytecccompopts="-fno-defer-pop $gcc_warnings" 10 + + # On recent version of OSX, gcc is a symlink to clang 11 + + if $bytecc --version | grep -q clang; then 12 + + # -fno-defer-pop is not supported by clang, and make recent 13 + + # versions of clang to fail 14 + + bytecccompopts="$gcc_warnings" 15 + + else 16 + + bytecccompopts="-fno-defer-pop $gcc_warnings" 17 + + fi 18 + mathlib="" 19 + mkexe="$mkexe -Wl,-no_compact_unwind" 20 + # Tell gcc that we can use 32-bit code addresses for threaded code
+1
pkgs/development/tools/misc/sloccount/default.nix
··· 31 31 32 32 configurePhase = '' 33 33 sed -i "makefile" -"es|PREFIX[[:blank:]]*=.*$|PREFIX = $out|g" 34 + sed -i "makefile" -"es|gcc|$CC|g" 34 35 ''; 35 36 36 37 doCheck = true;
+1 -1
pkgs/shells/fish/default.nix
··· 31 31 description = "Smart and user-friendly command line shell"; 32 32 homepage = "http://fishshell.com/"; 33 33 license = licenses.gpl2; 34 - platforms = platforms.linux; 34 + platforms = platforms.unix; 35 35 maintainers = with maintainers; [ ocharles ]; 36 36 }; 37 37 }
+2
pkgs/tools/compression/bzip2/default.nix
··· 26 26 sharedLibrary = 27 27 !stdenv.isDarwin && !(stdenv ? isDietLibC) && !(stdenv ? isStatic) && stdenv.system != "i686-cygwin" && !linkStatic; 28 28 29 + patchPhase = stdenv.lib.optionalString stdenv.isDarwin "substituteInPlace Makefile --replace 'CC=gcc' 'CC=clang'"; 30 + 29 31 preConfigure = "substituteInPlace Makefile --replace '$(PREFIX)/man' '$(PREFIX)/share/man'"; 30 32 31 33 makeFlags = if linkStatic then "LDFLAGS=-static" else "";
+1 -1
pkgs/tools/networking/isync/default.nix
··· 16 16 license = [ "GPLv2+" ]; 17 17 18 18 maintainers = with stdenv.lib.maintainers; [ the-kenny viric ]; 19 - platforms = stdenv.lib.platforms.linux; 19 + platforms = stdenv.lib.platforms.unix; 20 20 }; 21 21 }
+1 -1
pkgs/tools/typesetting/tex/tex4ht/default.nix
··· 14 14 cd src 15 15 for f in tex4ht t4ht htcmd ; do 16 16 # -DENVFILE="$out/share/texmf-nix/tex4ht/base/unix/tex4ht.env" 17 - gcc -o $f $f.c -I${tetex}/include -L${tetex}/lib -DHAVE_DIRENT_H -DHAVE_DIRENT_H -DKPATHSEA -lkpathsea 17 + $CC -o $f $f.c -I${tetex}/include -L${tetex}/lib -DHAVE_DIRENT_H -DHAVE_DIRENT_H -DKPATHSEA -lkpathsea 18 18 done 19 19 cd - 20 20 '';
-1
pkgs/tools/typesetting/tex/texlive/default.nix
··· 22 22 setupHook = ./setup-hook.sh; 23 23 24 24 doMainBuild = fullDepEntry ( stdenv.lib.optionalString stdenv.isDarwin '' 25 - export MACOSX_DEPLOYMENT_TARGET=10.9 26 25 export DYLD_LIBRARY_PATH="${poppler}/lib" 27 26 '' + '' 28 27 mkdir -p $out