diff --git a/pkgs/by-name/wv/wv2/fix-libtool-location.patch b/pkgs/by-name/wv/wv2/fix-libtool-location.patch new file mode 100644 index 000000000000..8b647de55e41 --- /dev/null +++ b/pkgs/by-name/wv/wv2/fix-libtool-location.patch @@ -0,0 +1,22 @@ +--- a/cmake/MacroCreateLibtoolFile.cmake ++++ b/cmake/MacroCreateLibtoolFile.cmake +@@ -9,7 +9,7 @@ + ENDMACRO (GET_TARGET_PROPERTY_WITH_DEFAULT) + + MACRO(CREATE_LIBTOOL_FILE _target _install_DIR) +- GET_TARGET_PROPERTY(_target_location ${_target} LOCATION) ++ + GET_TARGET_PROPERTY_WITH_DEFAULT(_target_static_lib ${_target} STATIC_LIB "") + GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dependency_libs ${_target} LT_DEPENDENCY_LIBS "") + GET_TARGET_PROPERTY_WITH_DEFAULT(_target_current ${_target} LT_VERSION_CURRENT 0) +@@ -19,8 +19,8 @@ + GET_TARGET_PROPERTY_WITH_DEFAULT(_target_shouldnotlink ${_target} LT_SHOULDNOTLINK yes) + GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dlopen ${_target} LT_DLOPEN "") + GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dlpreopen ${_target} LT_DLPREOPEN "") +- GET_FILENAME_COMPONENT(_laname ${_target_location} NAME_WE) +- GET_FILENAME_COMPONENT(_soname ${_target_location} NAME) ++ SET(_laname "lib${_target}") ++ SET(_soname "${_laname}${CMAKE_SHARED_LIBRARY_SUFFIX}") + SET(_laname ${PROJECT_BINARY_DIR}/${_laname}.la) + FILE(WRITE ${_laname} "# ${_laname} - a libtool library file\n") + FILE(WRITE ${_laname} "# Generated by CMake ${CMAKE_VERSION} (like GNU libtool)\n") diff --git a/pkgs/by-name/wv/wv2/package.nix b/pkgs/by-name/wv/wv2/package.nix index 1908fdf4e4be..2fa145158f29 100644 --- a/pkgs/by-name/wv/wv2/package.nix +++ b/pkgs/by-name/wv/wv2/package.nix @@ -17,7 +17,10 @@ stdenv.mkDerivation rec { sha256 = "1p1qxr8z5bsiq8pvlina3c8c1vjcb5d96bs3zz4jj3nb20wnsawz"; }; - patches = [ ./fix-include.patch ]; + patches = [ + ./fix-include.patch + ./fix-libtool-location.patch + ]; # Newer versions of clang default to C++17, which removes some deprecated APIs such as bind1st. # Setting the language version to C++14 makes them available again. @@ -40,6 +43,11 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = { description = "Excellent MS Word filter lib, used in most Office suites"; mainProgram = "wv2-config";