summary refs log tree commit diff
path: root/pkgs/development/libraries/soprano
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2012-01-02 11:12:27 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2012-01-02 11:12:27 +0000
commit78c300f0150f1ec8742d4b1fa80005a1b07f1950 (patch)
tree45c5a6328948e2fc51bbd9de8777ac0494888a9a /pkgs/development/libraries/soprano
parent097b7635af59d6b767aebfbeff1adca98e0898ee (diff)
downloadnixpkgs-78c300f0150f1ec8742d4b1fa80005a1b07f1950.tar
nixpkgs-78c300f0150f1ec8742d4b1fa80005a1b07f1950.tar.gz
nixpkgs-78c300f0150f1ec8742d4b1fa80005a1b07f1950.tar.bz2
nixpkgs-78c300f0150f1ec8742d4b1fa80005a1b07f1950.tar.lz
nixpkgs-78c300f0150f1ec8742d4b1fa80005a1b07f1950.tar.xz
nixpkgs-78c300f0150f1ec8742d4b1fa80005a1b07f1950.tar.zst
nixpkgs-78c300f0150f1ec8742d4b1fa80005a1b07f1950.zip
soprano-2.7.4, pass pkgconfig explicitly
svn path=/nixpkgs/trunk/; revision=31198
Diffstat (limited to 'pkgs/development/libraries/soprano')
-rw-r--r--pkgs/development/libraries/soprano/default.nix18
1 files changed, 6 insertions, 12 deletions
diff --git a/pkgs/development/libraries/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix
index 49e6e6b96df..40fd36840fd 100644
--- a/pkgs/development/libraries/soprano/default.nix
+++ b/pkgs/development/libraries/soprano/default.nix
@@ -1,26 +1,20 @@
-{ stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc }:
+{ stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc
+, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "soprano-2.7.0";
+  name = "soprano-2.7.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/soprano/${name}.tar.bz2";
-    sha256 = "1ki92wg0i9nhn1fh5mdcls5h9h3lf2k5r66snsags4x7zw0dmv2z";
+    sha256 = "0f6kg39bi4h4iblfs9ny88cs951sigm50yr6w50afc3f1nqzdmhp";
   };
 
-  patches =
-    [ (fetchurl { # Applied upstream, remove if upgrading
-        url = https://git.reviewboard.kde.org/r/102466/diff/raw/;
-        name = "soprano-virtuoso-restart.patch";
-        sha256 = "0jk038fp7ii6847mbxdajhhc7f6ap6lriaklxcqqxf6ddj37gf3y";
-      })
-      ./find-virtuoso.patch 
-    ];
+  patches = [ ./find-virtuoso.patch ];
 
   # We disable the Java backend, since we do not need them and they make the closure size much bigger
   buildInputs = [ qt4 clucene_core librdf_redland libiodbc ];
 
-  buildNativeInputs = [ cmake ];
+  buildNativeInputs = [ cmake pkgconfig ];
 
   meta = {
     homepage = http://soprano.sourceforge.net/;