diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-08-03 12:02:27 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-08-03 13:26:14 +0200 |
| commit | 5fc4ab1dfe9bb6fa7cc7d4728fe14aaa06431fc3 (patch) | |
| tree | 31b4f27e69c14bca709b6c7d24dba4856ce77ae1 /pkgs | |
| parent | 335575a51ed9b1f58de3a0258e10a26a47b6b59b (diff) | |
| download | nixpkgs-5fc4ab1dfe9bb6fa7cc7d4728fe14aaa06431fc3.tar nixpkgs-5fc4ab1dfe9bb6fa7cc7d4728fe14aaa06431fc3.tar.gz nixpkgs-5fc4ab1dfe9bb6fa7cc7d4728fe14aaa06431fc3.tar.bz2 nixpkgs-5fc4ab1dfe9bb6fa7cc7d4728fe14aaa06431fc3.tar.lz nixpkgs-5fc4ab1dfe9bb6fa7cc7d4728fe14aaa06431fc3.tar.xz nixpkgs-5fc4ab1dfe9bb6fa7cc7d4728fe14aaa06431fc3.tar.zst nixpkgs-5fc4ab1dfe9bb6fa7cc7d4728fe14aaa06431fc3.zip | |
freecad: small cleanup
* FreeCAD v0.14 switched from pyqt4 to pyside, remove unneeded pyqt4 dependency * cmake.patch is not used anymore, remove it * License is now only LGPLv2+ (since v0.14) * Homepage moved to http://www.freecadweb.org/ Ref. http://www.freecadweb.org/wiki/index.php?title=Release_notes_014
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/graphics/freecad/cmake.patch | 32 | ||||
| -rw-r--r-- | pkgs/applications/graphics/freecad/default.nix | 14 |
2 files changed, 7 insertions, 39 deletions
diff --git a/pkgs/applications/graphics/freecad/cmake.patch b/pkgs/applications/graphics/freecad/cmake.patch deleted file mode 100644 index 62efaf1e29d..00000000000 --- a/pkgs/applications/graphics/freecad/cmake.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -urN freecad-0.13.1830.old/cMake/FreeCadMacros.cmake freecad-0.13.1830/cMake/FreeCadMacros.cmake ---- freecad-0.13.1830.old/cMake/FreeCadMacros.cmake 2013-02-02 18:09:17.000000000 +0100 -+++ freecad-0.13.1830/cMake/FreeCadMacros.cmake 2014-04-20 10:52:17.293599913 +0200 -@@ -201,7 +201,7 @@ - #endmacro(fc_add_resources) - - MACRO (fc_add_resources outfiles ) -- QT4_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN}) -+ QT4_EXTRACT_OPTIONS(rcc_files rcc_options rcc_target ${ARGN}) - - FOREACH (it ${rcc_files}) - GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE) -diff -urN freecad-0.13.1830.old/CMakeLists.txt freecad-0.13.1830/CMakeLists.txt ---- freecad-0.13.1830.old/CMakeLists.txt 2013-02-02 18:09:17.000000000 +0100 -+++ freecad-0.13.1830/CMakeLists.txt 2014-04-20 10:28:41.782536753 +0200 -@@ -314,14 +314,14 @@ - macro(fc_wrap_cpp outfiles ) - # get include dirs - QT4_GET_MOC_FLAGS(moc_flags) -- QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN}) -+ QT4_EXTRACT_OPTIONS(moc_files moc_options moc_target ${ARGN}) - # fixes bug 0000585: bug with boost 1.48 - SET(moc_options ${moc_options} -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) - - foreach(it ${moc_files}) - get_filename_component(it ${it} ABSOLUTE) - QT4_MAKE_OUTPUT_FILE(${it} moc_ cpp outfile) -- QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}") -+ QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}" "") - set(${outfiles} ${${outfiles}} ${outfile}) - add_file_dependencies(${it} ${outfile}) - endforeach(it) diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 2f20291e270..a7665177046 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts -, boost, zlib, python, swig, gfortran, soqt, libf2c , pyqt4, makeWrapper +, boost, zlib, python, swig, gfortran, soqt, libf2c, makeWrapper , matplotlib, pycollada, pyside, pysideShiboken }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost - zlib python swig gfortran soqt libf2c pyqt4 makeWrapper matplotlib + zlib python swig gfortran soqt libf2c makeWrapper matplotlib pycollada pyside pysideShiboken ]; @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { patches = [ ./pythonpath.patch ]; - meta = { - homepage = http://free-cad.sourceforge.net/; - license = [ "GPLv2+" "LGPLv2+" ]; + meta = with stdenv.lib; { description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + homepage = http://www.freecadweb.org/; + license = licenses.lgpl2Plus; + maintainers = [ maintainers.viric ]; + platforms = platforms.linux; }; } |