diff options
author | Rob Vermaas <rob.vermaas@gmail.com> | 2011-11-06 14:26:55 +0000 |
---|---|---|
committer | Rob Vermaas <rob.vermaas@gmail.com> | 2011-11-06 14:26:55 +0000 |
commit | 25d6f604bb282b53759c1adc9a52c360ec37d49c (patch) | |
tree | c20b1b7b86a9514e59c30c604defb37fe54cc34a /pkgs/development/libraries/libofa | |
parent | 1b9adf9951c3badbc2c5413c22734807af44a248 (diff) | |
download | nixpkgs-25d6f604bb282b53759c1adc9a52c360ec37d49c.tar nixpkgs-25d6f604bb282b53759c1adc9a52c360ec37d49c.tar.gz nixpkgs-25d6f604bb282b53759c1adc9a52c360ec37d49c.tar.bz2 nixpkgs-25d6f604bb282b53759c1adc9a52c360ec37d49c.tar.lz nixpkgs-25d6f604bb282b53759c1adc9a52c360ec37d49c.tar.xz nixpkgs-25d6f604bb282b53759c1adc9a52c360ec37d49c.tar.zst nixpkgs-25d6f604bb282b53759c1adc9a52c360ec37d49c.zip |
add patches for libofa and libtunepipe due to remove curl/types.h in new curl
svn path=/nixpkgs/trunk/; revision=30261
Diffstat (limited to 'pkgs/development/libraries/libofa')
-rw-r--r-- | pkgs/development/libraries/libofa/curl-types.patch | 13 | ||||
-rw-r--r-- | pkgs/development/libraries/libofa/default.nix | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libofa/curl-types.patch b/pkgs/development/libraries/libofa/curl-types.patch new file mode 100644 index 00000000000..acd8d9aeabb --- /dev/null +++ b/pkgs/development/libraries/libofa/curl-types.patch @@ -0,0 +1,13 @@ +diff -rc libofa-0.9.3/examples/protocol.cpp libofa-0.9.3-new/examples/protocol.cpp +*** libofa-0.9.3/examples/protocol.cpp 2006-05-10 14:05:42.000000000 -0400 +--- libofa-0.9.3-new/examples/protocol.cpp 2011-11-06 09:24:05.653283203 -0500 +*************** +*** 12,18 **** + #include <map> + #include <expat.h> + #include <curl/curl.h> +- #include <curl/types.h> + #include <curl/easy.h> + + using namespace std; +--- 12,17 ---- diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix index 437726d6976..6b1ceee40f1 100644 --- a/pkgs/development/libraries/libofa/default.nix +++ b/pkgs/development/libraries/libofa/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ expat curl fftw ]; - patches = [ ./libofa-0.9.3-gcc-4.patch ./libofa-0.9.3-gcc-4.3.patch ./gcc-4.x.patch ]; + patches = [ ./libofa-0.9.3-gcc-4.patch ./libofa-0.9.3-gcc-4.3.patch ./gcc-4.x.patch ./curl-types.patch ]; src = fetchurl { url = "http://musicip-libofa.googlecode.com/files/${name}.tar.gz"; |