b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

osslsigncode: 2.3 -> 2.5

Browse source
This commit is contained in:
Charles Duffy 2023-03-13 12:28:05 -05:00
parent 3a639575a8
commit 77f3fa8c58
No known key found for this signature in database
GPG key ID: F5852B6FA75D7BB2
2 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/development/tools/osslsigncode/darwin-cmake.patch Normal file
View 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)

10
pkgs/development/tools/osslsigncode/default.nix
View file

@ -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 ];