diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-06-24 17:49:48 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-06-24 17:51:07 -0700 |
| commit | 42bd1dc12f9ff42cf5de54fa28e079069a941a0d (patch) | |
| tree | ce9c0aa670eebe9d28770dc53166219a038a16cb /pkgs | |
| parent | bc4b46c14232a93783c09f71d676a5bd7bf4b87b (diff) | |
| download | nixlib-42bd1dc12f9ff42cf5de54fa28e079069a941a0d.tar nixlib-42bd1dc12f9ff42cf5de54fa28e079069a941a0d.tar.gz nixlib-42bd1dc12f9ff42cf5de54fa28e079069a941a0d.tar.bz2 nixlib-42bd1dc12f9ff42cf5de54fa28e079069a941a0d.tar.lz nixlib-42bd1dc12f9ff42cf5de54fa28e079069a941a0d.tar.xz nixlib-42bd1dc12f9ff42cf5de54fa28e079069a941a0d.tar.zst nixlib-42bd1dc12f9ff42cf5de54fa28e079069a941a0d.zip | |
accelio: 1.3 -> 1.4
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/accelio/cflags.patch | 21 | ||||
| -rw-r--r-- | pkgs/development/libraries/accelio/default.nix | 10 |
2 files changed, 6 insertions, 25 deletions
diff --git a/pkgs/development/libraries/accelio/cflags.patch b/pkgs/development/libraries/accelio/cflags.patch deleted file mode 100644 index a09045191226..000000000000 --- a/pkgs/development/libraries/accelio/cflags.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 6ce6b6b..72d2e65 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -110,14 +110,10 @@ AC_MSG_RESULT([$enable_debug]) - - if test "$enable_debug" = "yes"; then - AC_DEFINE([DEBUG],[],[Debug Mode]) -- AM_CFLAGS="$AM_CFLAGS -g -ggdb -Wall -Werror -Wdeclaration-after-statement \ -- -Wsign-compare -Wc++-compat \ -- -fno-omit-frame-pointer -O0 -D_REENTRANT -D_GNU_SOURCE" -+ AM_CFLAGS="$AM_CFLAGS -g -ggdb -fno-omit-frame-pointer -O0 -D_REENTRANT -D_GNU_SOURCE" - else - AC_DEFINE([NDEBUG],[],[No-debug Mode]) -- AM_CFLAGS="$AM_CFLAGS -g -ggdb -Wall -Werror -Wpadded -Wdeclaration-after-statement \ -- -Wsign-compare -Wc++-compat \ -- -O3 -D_REENTRANT -D_GNU_SOURCE" -+ AM_CFLAGS="$AM_CFLAGS -O3 -D_REENTRANT -D_GNU_SOURCE" - fi - - AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script, diff --git a/pkgs/development/libraries/accelio/default.nix b/pkgs/development/libraries/accelio/default.nix index b56f2d81389d..7a96e5923b60 100644 --- a/pkgs/development/libraries/accelio/default.nix +++ b/pkgs/development/libraries/accelio/default.nix @@ -6,23 +6,25 @@ stdenv.mkDerivation rec { name = "accelio-${version}${stdenv.lib.optionalString (kernel != null) "-kernel"}"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "accelio"; repo = "accelio"; rev = "v${version}"; - sha256 = "05yqzjs12nymhs0pq1ypnfszgbmvfprjqd3gr2iz3vqbkpzi9n2c"; + sha256 = "0cxiwn63481m88zisd0pqs6g0h5k1amz2kidwyxkdbl6xgf70cwd"; }; - patches = [ ./cflags.patch ]; - postPatch = '' # Don't build broken examples sed -i '/AC_CONFIG_SUBDIRS(\[\(examples\|tests\)\/kernel/d' configure.ac # Allow the installation of xio kernel headers sed -i 's,/opt/xio,''${out},g' src/kernel/xio/Makefile.in + + # Don't install ldconfig entries + sed -i '\,/etc/ld.so.conf.d/libxio.conf,d' src/usr/Makefile.am + sed -i '\,/sbin/ldconfig,d' src/usr/Makefile.am ''; nativeBuildInputs = [ autoreconfHook ]; |