diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-06-19 19:22:30 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-06-19 19:22:30 +0000 |
| commit | 6c3ffdc228a9808c65a0205cd1fd404578d02dee (patch) | |
| tree | c5998bfbac1bc92dace314e051164f830976d661 /nixpkgs/pkgs/development/libraries/opencascade-occt | |
| parent | ef93931efff0323fd13c4270415b578c73b5ef35 (diff) | |
| parent | 83ba5afcc9682b52b39a9a958f730b966cc369c5 (diff) | |
| download | nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.gz nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.bz2 nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.lz nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.xz nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.zst nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.zip | |
Merge commit '83ba5afcc9682b52b39a9a958f730b966cc369c5'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/opencascade-occt')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix b/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix index 2d1e0ffb2005..83b1cfc2addf 100644 --- a/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix +++ b/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix @@ -1,22 +1,10 @@ -{ stdenv -, fetchurl -, cmake -, tcl -, tk -, vtk -, mesa_glu -, libXext -, libXmu -, libXi -, doxygen -}: +{ stdenv, fetchurl, fetchpatch, cmake, ninja, tcl, tk, + libGL, libGLU, libXext, libXmu, libXi }: -let version = "7.3.0p3"; - commit = "V${builtins.replaceStrings ["."] ["_"] version}"; - -in stdenv.mkDerivation { - - name = "opencascade-occt-${version}"; +stdenv.mkDerivation rec { + pname = "opencascade-occt"; + version = "7.3.0p3"; + commit = "V${builtins.replaceStrings ["."] ["_"] version}"; src = fetchurl { name = "occt-${commit}.tar.gz"; @@ -24,10 +12,8 @@ in stdenv.mkDerivation { sha256 = "0k9c3ypcnjcilq1dhsf6xxbd52gyq4h5rchvp30k3c8ph4ris5pz"; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ tcl tk vtk mesa_glu libXext libXmu libXi doxygen ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ cmake ninja ]; + buildInputs = [ tcl tk libGL libGLU libXext libXmu libXi ]; meta = with stdenv.lib; { description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; |