osslsigncode: 2.3 -> 2.5
This commit is contained in:
parent
3a639575a8
commit
77f3fa8c58
20
pkgs/development/tools/osslsigncode/darwin-cmake.patch
Normal file
20
pkgs/development/tools/osslsigncode/darwin-cmake.patch
Normal file
|
@ -0,0 +1,20 @@
|
|||
diff --git a/cmake/SetCompilerFlags.cmake b/cmake/SetCompilerFlags.cmake
|
||||
index 8e83390..bd734f0 100644
|
||||
--- a/cmake/SetCompilerFlags.cmake
|
||||
+++ b/cmake/SetCompilerFlags.cmake
|
||||
@@ -98,13 +98,13 @@ function(add_compile_flags target)
|
||||
endif()
|
||||
endif()
|
||||
# Support address space layout randomization (ASLR)
|
||||
- if(NOT (MINGW OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang"))
|
||||
+ if(NOT (MINGW OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang" OR ((CMAKE_SYSTEM_NAME MATCHES Darwin) AND (CMAKE_C_COMPILER_ID MATCHES Clang))))
|
||||
target_compile_options(${target} PRIVATE -fPIE)
|
||||
target_link_options(${target} PRIVATE -fPIE -pie)
|
||||
target_link_options(${target} PRIVATE -Wl,-z,relro)
|
||||
target_link_options(${target} PRIVATE -Wl,-z,now)
|
||||
target_link_options(${target} PRIVATE -Wl,-z,noexecstack)
|
||||
- endif(NOT (MINGW OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang"))
|
||||
+ endif(NOT (MINGW OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang" OR ((CMAKE_SYSTEM_NAME MATCHES Darwin) AND (CMAKE_C_COMPILER_ID MATCHES Clang))))
|
||||
target_link_options(${target} PRIVATE -fstack-check)
|
||||
add_compile_flag_to_targets(${target})
|
||||
endif(MSVC)
|
|
@ -1,7 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, cmake
|
||||
, pkg-config
|
||||
, curl
|
||||
, openssl
|
||||
|
@ -9,16 +9,18 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osslsigncode";
|
||||
version = "2.3";
|
||||
version = "2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mtrojnar";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-KJyGDrT3dr8DfjfRrWIENoBFuiWrgQx4qz1V+mT8/yI=";
|
||||
sha256 = "sha256-33uT9PFD1YEIMzifZkpbl2EAoC98IsM72K4rRjDfh8g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
patches = [ ./darwin-cmake.patch ];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [ curl openssl ];
|
||||
|
||||
|
|
Loading…
Reference in a new issue