summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
authorJames Cook <james.cook@utoronto.ca>2013-07-14 17:08:26 -0700
committerVladimír Čunát <vcunat@gmail.com>2013-07-15 12:25:24 +0200
commitdc8d794208ddca5c544e9102126c5ab93e93b6ea (patch)
tree774f78757f02cc86c4c5232b74fea1802a3d5cd4 /pkgs/development/libraries
parentdafb31a8e181971ceadb10b3780eb37790e4cb0e (diff)
downloadnixpkgs-dc8d794208ddca5c544e9102126c5ab93e93b6ea.tar
nixpkgs-dc8d794208ddca5c544e9102126c5ab93e93b6ea.tar.gz
nixpkgs-dc8d794208ddca5c544e9102126c5ab93e93b6ea.tar.bz2
nixpkgs-dc8d794208ddca5c544e9102126c5ab93e93b6ea.tar.lz
nixpkgs-dc8d794208ddca5c544e9102126c5ab93e93b6ea.tar.xz
nixpkgs-dc8d794208ddca5c544e9102126c5ab93e93b6ea.tar.zst
nixpkgs-dc8d794208ddca5c544e9102126c5ab93e93b6ea.zip
strigi: patch to compile on stdenv-updates (close #755)
This patch exports a class with STRIGI_EXPORT that wasn't exported
before.
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/strigi/default.nix2
-rw-r--r--pkgs/development/libraries/strigi/export_bufferedstream.patch12
2 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix
index fc8dc123032..6b8b611d3f7 100644
--- a/pkgs/development/libraries/strigi/default.nix
+++ b/pkgs/development/libraries/strigi/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig perl ];
 
+  patches = [ ./export_bufferedstream.patch ];
+
   enableParallelBuilding = true;
 
   meta = {
diff --git a/pkgs/development/libraries/strigi/export_bufferedstream.patch b/pkgs/development/libraries/strigi/export_bufferedstream.patch
new file mode 100644
index 00000000000..4c6b34fe1be
--- /dev/null
+++ b/pkgs/development/libraries/strigi/export_bufferedstream.patch
@@ -0,0 +1,12 @@
+diff -u -r strigi-0.7.8/libstreams/include/strigi/bufferedstream.h strigi-0.7.8_new/libstreams/include/strigi/bufferedstream.h
+--- strigi-0.7.8/libstreams/include/strigi/bufferedstream.h	2013-02-05 13:34:57.000000000 -0800
++++ strigi-0.7.8_new/libstreams/include/strigi/bufferedstream.h	2013-07-14 17:01:54.000000000 -0700
+@@ -34,7 +34,7 @@
+  * BufferedStream will do the rest.
+  */
+ template <class T>
+-class BufferedStream : public StreamBase<T> {
++class STRIGI_EXPORT BufferedStream : public StreamBase<T> {
+ private:
+     StreamBuffer<T> buffer;
+     bool finishedWritingToBuffer;