From a76b0fb6fadc7cc70296a074d7fb0519e8dc80d0 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Fri, 4 Mar 2011 09:48:24 +0000 Subject: Making freecad install; it still does not find all shared objects though. Either eigen changed the hash of the tarball, or I did not commit its latest hash. I add boost 1.46 apart, because 1.44 does not work easily for freecad. svn path=/nixpkgs/trunk/; revision=26151 --- .../graphics/freecad/cmakeinstall.patch | 44 ++++++++++++++++++++++ pkgs/applications/graphics/freecad/default.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/applications/graphics/freecad/cmakeinstall.patch (limited to 'pkgs/applications/graphics/freecad') diff --git a/pkgs/applications/graphics/freecad/cmakeinstall.patch b/pkgs/applications/graphics/freecad/cmakeinstall.patch new file mode 100644 index 00000000000..10d8196169d --- /dev/null +++ b/pkgs/applications/graphics/freecad/cmakeinstall.patch @@ -0,0 +1,44 @@ +Index: src/3rdParty/salomesmesh/CMakeLists.txt +=================================================================== +--- a/src/3rdParty/salomesmesh/CMakeLists.txt (revision 4193) ++++ a/src/3rdParty/salomesmesh/CMakeLists.txt (working copy) +@@ -206,21 +206,3 @@ + IF(MINGW) + SET_TARGET_PROPERTIES(StdMeshers PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + ENDIF(MINGW) +- +-########### +-# INSTALL # +-########### +- +-# Path name install: for instance, SMESH-5.1.2.7 +-SET(INSTALL_PATH_NAME SMESH-${SMESH_VERSION_MAJOR}.${SMESH_VERSION_MINOR}.${SMESH_VERSION_PATCH}.${SMESH_VERSION_TWEAK}) +- +-IF(UNIX) +- # Libraries are installed by default in /usr/local/lib/SMESH-5.1.2.7 +- INSTALL(TARGETS SMDS Driver DriverSTL DriverDAT DriverUNV +- SMESHDS SMESH StdMeshers +- DESTINATION /usr/local/lib/${INSTALL_PATH_NAME}) +- # Headers are installed by default in /usr/local/include/SMESH-5.1.2.7 +- INSTALL(DIRECTORY inc/ +- DESTINATION /usr/local/include/${INSTALL_PATH_NAME} +- FILES_MATCHING PATTERN "*.h*") +-ENDIF(UNIX) +Index: CMakeLists.txt +=================================================================== +--- a/CMakeLists.txt (revision 4193) ++++ a/CMakeLists.txt (working copy) +@@ -57,13 +57,6 @@ + + # ================================================================================ + +- +-if(WIN32) +- SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}) +-else(WIN32) +- SET(CMAKE_INSTALL_PREFIX "/usr/lib/freecad") +-endif(WIN32) +- + # ================================================================================ + # == Win32 is default behaviour use the LibPack copied in Source tree ============ + if(MSVC) diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 447261b15df..58e36369f04 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { # this for freecad to build NIX_CFLAGS_COMPILE = "-DBOOST_FILESYSTEM_VERSION=2"; + patches = [ ./cmakeinstall.patch ]; + meta = { homepage = http://free-cad.sourceforge.net/; license = [ "GPLv2+" "LGPLv2+" ]; -- cgit 1.4.1