diff options
author | janus <janus@xn--kn-1ia.guru> | 2015-11-26 17:33:58 +0000 |
---|---|---|
committer | janus <janus@xn--kn-1ia.guru> | 2016-01-01 17:01:13 +0000 |
commit | 9897b356612c4bb06a9c9d688da52134dfe8fb95 (patch) | |
tree | d4a41b097c29781ba05d8635d0296f94cc95a9c4 /pkgs/development | |
parent | f351aaaf85c6b6323660db6ce638f057947a333f (diff) | |
download | nixpkgs-9897b356612c4bb06a9c9d688da52134dfe8fb95.tar nixpkgs-9897b356612c4bb06a9c9d688da52134dfe8fb95.tar.gz nixpkgs-9897b356612c4bb06a9c9d688da52134dfe8fb95.tar.bz2 nixpkgs-9897b356612c4bb06a9c9d688da52134dfe8fb95.tar.lz nixpkgs-9897b356612c4bb06a9c9d688da52134dfe8fb95.tar.xz nixpkgs-9897b356612c4bb06a9c9d688da52134dfe8fb95.tar.zst nixpkgs-9897b356612c4bb06a9c9d688da52134dfe8fb95.zip |
FreeBSD: patch expat, kerberos, libedit, ossp-uuid, lz4, sharutils, add libelf-freebsd
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/expat/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/libraries/kerberos/krb5.nix | 10 | ||||
-rw-r--r-- | pkgs/development/libraries/libedit/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libedit/freebsd-wchar.patch | 13 | ||||
-rw-r--r-- | pkgs/development/libraries/libelf-freebsd/default.nix | 28 | ||||
-rw-r--r-- | pkgs/development/libraries/libossp-uuid/default.nix | 2 |
6 files changed, 53 insertions, 5 deletions
diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 05cfeaee423..78e2da3ffdb 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -10,6 +10,9 @@ stdenv.mkDerivation rec { patches = [ ./CVE-2015-1283.patch ]; + configureFlags = stdenv.lib.optionalString stdenv.isFreeBSD "--with-pic"; + # NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.isFreeBSD) "-fPIC"; + meta = with stdenv.lib; { homepage = http://www.libexpat.org/; description = "A stream-oriented XML parser library written in C"; diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 2e5e48891b8..b263a4ef06c 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -11,13 +11,15 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "${type}krb5-${version}"; - version = "1.13.2"; + version = "1.14"; src = fetchurl { - url = "${meta.homepage}dist/krb5/1.13/krb5-${version}-signed.tar"; - sha256 = "1qbdzyrws7d0q4filsibh28z54pd5l987jr0ygv43iq9085w6a75"; + url = "${meta.homepage}dist/krb5/1.14/krb5-${version}.tar.gz"; + sha256 = "1sgr61cnkgc5xazijaww6wpn5fnxl9vyj9ixk3r3y7ikv3x0gnyf"; }; + configureFlags = stdenv.lib.optionalString stdenv.isFreeBSD ''WARN_CFLAGS=""''; + nativeBuildInputs = [ pkgconfig perl yacc ] # Provides the mig command used by the build scripts ++ stdenv.lib.optional stdenv.isDarwin bootstrap_cmds; @@ -26,7 +28,7 @@ stdenv.mkDerivation rec { unpackPhase = '' tar -xf $src - tar -xzf krb5-${version}.tar.gz + #tar -xzf krb5-${version}.tar.gz cd krb5-${version}/src ''; diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index dc8ecf7e95d..5234c16e135 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = if stdenv.isCygwin then [ ./01-cygwin.patch - ] else null; + ] else [ ] ++ [ ./freebsd-wchar.patch ]; postInstall = '' find $out/lib -type f | grep '\.\(la\|pc\)''$' | xargs sed -i \ diff --git a/pkgs/development/libraries/libedit/freebsd-wchar.patch b/pkgs/development/libraries/libedit/freebsd-wchar.patch new file mode 100644 index 00000000000..6bf7fb0ef69 --- /dev/null +++ b/pkgs/development/libraries/libedit/freebsd-wchar.patch @@ -0,0 +1,13 @@ +diff --git a/src/chartype.h b/src/chartype.h +index 0beee17..4ac86f3 100644 +--- a/src/chartype.h ++++ b/src/chartype.h +@@ -44,7 +44,7 @@ + * supports non-BMP code points without requiring UTF-16, but nothing + * seems to actually advertise this properly, despite Unicode 3.1 having + * been around since 2001... */ +-#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__) ++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__) + #ifndef __STDC_ISO_10646__ + /* In many places it is assumed that the first 127 code points are ASCII + * compatible, so ensure wchar_t indeed does ISO 10646 and not some other diff --git a/pkgs/development/libraries/libelf-freebsd/default.nix b/pkgs/development/libraries/libelf-freebsd/default.nix new file mode 100644 index 00000000000..ee0b6d50408 --- /dev/null +++ b/pkgs/development/libraries/libelf-freebsd/default.nix @@ -0,0 +1,28 @@ +{ fetchsvn, stdenv }: + +stdenv.mkDerivation (rec { + version = "3258"; + name = "libelf-freebsd-${version}"; + + #src = fetchurl { + # url = "http://sourceforge.net/code-snapshots/svn/e/el/elftoolchain/code/elftoolchain-code-${version}-trunk.zip"; + # sha256 = "0vf7s9dwk2xkmhb79aigqm0x0yfbw1j0b9ksm51207qwr179n6jr"; + #}; + src = fetchsvn { + url = svn://svn.code.sf.net/p/elftoolchain/code/trunk ; + rev = 3258; + }; + + doCheck = true; + + meta = { + description = "Essential compilation tools and libraries for building and analyzing ELF based program images"; + + homepage = https://sourceforge.net/p/elftoolchain/wiki/Home/; + + license = stdenv.lib.licenses.bsd2; + + platforms = stdenv.lib.platforms.freebsd; + maintainers = [ ]; + }; +}) diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix index 119f4111666..ddfc2a5132c 100644 --- a/pkgs/development/libraries/libossp-uuid/default.nix +++ b/pkgs/development/libraries/libossp-uuid/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation { sha256= "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0"; }; + configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; + meta = with stdenv.lib; { homepage = http://www.ossp.org/pkg/lib/uuid/; description = "OSSP uuid ISO-C and C++ shared library"; |