summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2016-12-30 22:12:45 +0000
committerGitHub <noreply@github.com>2016-12-30 22:12:45 +0000
commit8f961e8b14a0b183845196047e466cfb537c2c91 (patch)
treed6c3b6f3176efaeaf598f2b2c5826e73d0023ec8 /pkgs
parent3b0720dbe445fd558bf8d235c0f0139bd7b0d901 (diff)
parent86d55f0380188d6e91c76cbbd79af82182842455 (diff)
downloadnixlib-8f961e8b14a0b183845196047e466cfb537c2c91.tar
nixlib-8f961e8b14a0b183845196047e466cfb537c2c91.tar.gz
nixlib-8f961e8b14a0b183845196047e466cfb537c2c91.tar.bz2
nixlib-8f961e8b14a0b183845196047e466cfb537c2c91.tar.lz
nixlib-8f961e8b14a0b183845196047e466cfb537c2c91.tar.xz
nixlib-8f961e8b14a0b183845196047e466cfb537c2c91.tar.zst
nixlib-8f961e8b14a0b183845196047e466cfb537c2c91.zip
Merge pull request #21474 from mimadrid/update/openbabel-2.4.1
openbabel: 2.3.2 -> 2.4.1
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/openbabel/default.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix
index 3c4cd8bb6c8d..b124e592f367 100644
--- a/pkgs/development/libraries/openbabel/default.nix
+++ b/pkgs/development/libraries/openbabel/default.nix
@@ -1,23 +1,23 @@
-{stdenv, fetchurl, cmake, zlib, libxml2, eigen, python, cairo, pkgconfig }:
+{stdenv, fetchurl, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "openbabel-2.3.2";
+  name = "openbabel-${version}";
+  version = "2.4.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/openbabel/${name}.tar.gz";
-    sha256 = "122if0jkm71ngd1b0dic8k567b3j2hcikbwnpxgchv5ag5ka5b2f";
+    url = "https://github.com/openbabel/openbabel/archive/openbabel-${stdenv.lib.replaceStrings ["."] ["-"] version}.tar.gz";
+    sha256 = "0xm7y859ivq2cp0q08mwshfxm0jq31xkyr4x8s0j6l7khf57yk2r";
   };
 
   # TODO : perl & python bindings;
   # TODO : wxGTK: I have no time to compile
   # TODO : separate lib and apps
-  buildInputs = [ zlib libxml2 eigen python cairo ];
+  buildInputs = [ zlib libxml2 eigen python cairo pcre ];
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
   meta = {
     platforms = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.urkud ];
-    broken = true; # doesn't build with GCC 5; fix in GitHub
   };
 }