Merge commit '83ba5afcc9682b52b39a9a958f730b966cc369c5'

1 files changed, 14 insertions, 19 deletions

diff --git a/nixpkgs/pkgs/development/libraries/coin3d/default.nix b/nixpkgs/pkgs/development/libraries/coin3d/default.nix
index 442ed2a4b9a5..80b6480323be 100644
--- a/nixpkgs/pkgs/development/libraries/coin3d/default.nix
+++ b/nixpkgs/pkgs/development/libraries/coin3d/default.nix
@@ -1,30 +1,25 @@
-{ fetchurl, stdenv, libGLU_combined }:
+{ fetchFromBitbucket, stdenv, boost, cmake, libGLU_combined }:
 
 stdenv.mkDerivation rec {
-  name = "coin3d-${version}";
-  version = "3.1.3";
+  pname = "coin";
+  version = "unstable-2019-06-12";
 
-  src = fetchurl {
-    url = "https://bitbucket.org/Coin3D/coin/downloads/Coin-${version}.tar.gz";
-    sha256 = "05ylhrcglm81dajbk132l1w892634z2i97x10fm64y1ih72phd2q";
+  src = fetchFromBitbucket {
+    owner = "Coin3D";
+    repo = "coin";
+    rev = "8d860d7ba112b22c4e9b289268fd8b3625ab81d3";
+    sha256 = "1cpncljqvw28k5wvpgchv593nayhby5gwpvbnyllc9hb9ms816xn";
   };
 
-  patches = [
-    (fetchurl {
-      url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/coin/files/coin-3.1.3-gcc-4.7.patch;
-      name = "gcc-4.7.patch";
-      sha256 = "076dyc52swk8qc7ylps53fg6iqmd52x8s7m18i80x49dd109yw20";
-    })
-    ./gcc-4.8.patch # taken from FC-17 source rpm
-    # see https://bitbucket.org/Coin3D/coin/issues/128/crash-in-cc_memalloc_deallocate
-    # patch adapted from https://bitbucket.org/Coin3D/coin/pull-requests/75/added-fix-for-issue-128-provided-by-fedora/diff
-    ./sbhashentry.patch
-  ];
+  postPatch = ''
+    sed -i /cpack.d/d CMakeLists.txt
+  '';
 
-  buildInputs = [ libGLU_combined ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ boost libGLU_combined ];
 
   meta = {
-    homepage = http://www.coin3d.org/;
+    homepage = "https://bitbucket.org/Coin3D/coin/wiki/Home";
     license = stdenv.lib.licenses.gpl2Plus;
     description = "High-level, retained-mode toolkit for effective 3D graphics development";
     maintainers = [ stdenv.lib.maintainers.viric ];