Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

FreeBSD support

janus a1ade02c 35cf6c42

+39 -9
+3 -2
pkgs/applications/altcoins/bitcoin.nix
··· 1 1 { stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost 2 - , zlib, miniupnpc, qt4, utillinux, protobuf, qrencode 2 + , zlib, miniupnpc, qt4, protobuf, qrencode 3 3 , withGui }: 4 4 5 5 with stdenv.lib; ··· 17 17 }; 18 18 19 19 buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib 20 - miniupnpc utillinux protobuf ] 20 + miniupnpc protobuf ] 21 + ++ optionals stdenv.isLinux [ utillinux ] 21 22 ++ optionals withGui [ qt4 qrencode ]; 22 23 23 24 configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ]
+5 -1
pkgs/development/compilers/sbcl/bootstrap.nix
··· 23 23 sha256 = "0sp5445rbvms6qvzhld0kwwvydw51vq5iaf4kdqsf2d9jvaz3yx5"; 24 24 }; 25 25 armv6l-linux = armv7l-linux; 26 - x86_64-solaris = x86_64-linux; 26 + x86_64-freebsd = rec { 27 + version = "1.2.7"; 28 + system = "x86-64-freebsd"; 29 + sha256 = "14k42xiqd2rrim4pd5k5pjcrpkac09qnpynha8j1v4jngrvmw7y6"; 30 + }; 27 31 }; 28 32 cfg = options.${stdenv.system}; 29 33 in
+22
pkgs/development/libraries/db/clang-4.8.patch
··· 1 + diff --git a/dbinc/atomic.h b/dbinc/atomic.h 2 + index 0034dcc..fa7ba93 100644 3 + --- a/dbinc/atomic.h 4 + +++ b/dbinc/atomic.h 5 + @@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val; 6 + #define atomic_inc(env, p) __atomic_inc(p) 7 + #define atomic_dec(env, p) __atomic_dec(p) 8 + #define atomic_compare_exchange(env, p, o, n) \ 9 + - __atomic_compare_exchange((p), (o), (n)) 10 + + __db_atomic_compare_exchange((p), (o), (n)) 11 + static inline int __atomic_inc(db_atomic_t *p) 12 + { 13 + int temp; 14 + @@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p) 15 + * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html 16 + * which configure could be changed to use. 17 + */ 18 + -static inline int __atomic_compare_exchange( 19 + +static inline int __db_atomic_compare_exchange( 20 + db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval) 21 + { 22 + atomic_value_t was;
+1
pkgs/development/libraries/db/db-4.8.nix
··· 2 2 3 3 import ./generic.nix (args // rec { 4 4 version = "4.8.30"; 5 + extraPatches = [ ./clang-4.8.patch ]; 5 6 sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0"; 6 7 branch = "4.8"; 7 8 })
+1 -1
pkgs/development/libraries/db/db-5.3.nix
··· 3 3 import ./generic.nix (args // rec { 4 4 version = "5.3.28"; 5 5 sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"; 6 - extraPatches = [ ./osx.patch ]; 6 + extraPatches = [ ./clang-5.3.patch ]; 7 7 branch = "5.3"; 8 8 })
pkgs/development/libraries/db/osx.patch pkgs/development/libraries/db/clang-5.3.patch
+1 -1
pkgs/development/libraries/glib/default.nix
··· 7 7 8 8 with stdenv.lib; 9 9 10 - assert !stdenv.isDarwin -> stdenv.cc.isGNU; 10 + assert stdenv.isFreeBSD || stdenv.isDarwin || stdenv.cc.isGNU; 11 11 12 12 # TODO: 13 13 # * Add gio-module-fam
+2 -1
pkgs/development/libraries/libiconv/default.nix
··· 19 19 # (Windows' linker would need to be used somehow to produce an actual 20 20 # DLL.) Thus, build the static library too, and this is what Gettext 21 21 # will actually use. 22 - configureFlags = if stdenv.isCygwin then [ "--enable-static" ] else null; 22 + configureFlags = if stdenv.isCygwin then [ "--enable-static" ] else 23 + if stdenv.isFreeBSD then [ "--with-pic" ] else null; 23 24 24 25 crossAttrs = { 25 26 # Disable stripping to avoid "libiconv.a: Archive has no index" (MinGW).
+3 -2
pkgs/tools/compression/bzip2/default.nix
··· 58 58 ln -s bzip2 $out/bin/bzcat 59 59 ''; 60 60 61 - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' 62 - substituteInPlace Makefile --replace 'CC=gcc' 'CC=clang' 61 + patchPhase = '' 62 + substituteInPlace Makefile --replace CC=gcc CC=cc 63 + substituteInPlace Makefile-libbz2_so --replace CC=gcc CC=cc 63 64 ''; 64 65 65 66 preConfigure = ''
+1 -1
pkgs/tools/networking/miniupnpc/default.nix
··· 18 18 inherit version; 19 19 homepage = http://miniupnp.free.fr/; 20 20 description = "A client that implements the UPnP Internet Gateway Device (IGD) specification"; 21 - platforms = stdenv.lib.platforms.linux; 21 + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.freebsd; 22 22 }; 23 23 }