diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2016-08-24 19:56:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-24 19:56:24 +0200 |
| commit | 8b8a74d5d60191490031e89eb72cbcec335f8842 (patch) | |
| tree | 6214ddb078f05c774d832a976207152c330b08f9 | |
| parent | e208e698f9a44b610334d30d7b19c3480f81edbe (diff) | |
| parent | a9e913ffbf9aa7e9efa5326e02eb5fb447528366 (diff) | |
| download | nixlib-8b8a74d5d60191490031e89eb72cbcec335f8842.tar nixlib-8b8a74d5d60191490031e89eb72cbcec335f8842.tar.gz nixlib-8b8a74d5d60191490031e89eb72cbcec335f8842.tar.bz2 nixlib-8b8a74d5d60191490031e89eb72cbcec335f8842.tar.lz nixlib-8b8a74d5d60191490031e89eb72cbcec335f8842.tar.xz nixlib-8b8a74d5d60191490031e89eb72cbcec335f8842.tar.zst nixlib-8b8a74d5d60191490031e89eb72cbcec335f8842.zip | |
Merge pull request #17864 from LnL7/darwin-libsecurity
darwin.libsecurity: fix for gnustep makefiles
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/security-tool/default.nix | 10 |
2 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix index ccce7448e5db..ef449a7d415d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix @@ -29,7 +29,7 @@ name: version: sha256: args: let makeFlagsArray=(-j''$NIX_BUILD_CORES) ''; buildInputs = [ - pkgs.gnustep-make + pkgs.gnustep.make pkgs.darwin.apple_sdk.frameworks.AppKit pkgs.darwin.apple_sdk.frameworks.Foundation pkgs.darwin.cf-private @@ -38,6 +38,7 @@ name: version: sha256: args: let "-f${makeFile}" "MAKEFILE_NAME=${makeFile}" "GNUSTEP_ABSOLUTE_INSTALL_PATHS=yes" + "GNUSTEP_MAKEFILES=${pkgs.gnustep.make}/share/GNUstep/Makefiles" "LIB_LINK_INSTALL_DIR=\$(out)/lib" ]; installFlags = [ diff --git a/pkgs/os-specific/darwin/security-tool/default.nix b/pkgs/os-specific/darwin/security-tool/default.nix index f0877aa3404e..6944d2b8b437 100644 --- a/pkgs/os-specific/darwin/security-tool/default.nix +++ b/pkgs/os-specific/darwin/security-tool/default.nix @@ -1,5 +1,5 @@ { CoreServices, Foundation, PCSC, Security, GSS, Kerberos, makeWrapper, apple_sdk, -fetchurl, gnustep-make, libobjc, libsecurity_apple_csp, libsecurity_apple_cspdl, +fetchurl, gnustep, libobjc, libsecurity_apple_csp, libsecurity_apple_cspdl, libsecurity_apple_file_dl, libsecurity_apple_x509_cl, libsecurity_apple_x509_tp, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_cssm, libsecurity_filedb, @@ -39,7 +39,11 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-no_dtrace_dof"; - makeFlags = "-f ${./GNUmakefile} MAKEFILE_NAME=${./GNUmakefile}"; + makeFlags = [ + "-f ${./GNUmakefile}" + "MAKEFILE_NAME=${./GNUmakefile}" + "GNUSTEP_MAKEFILES=${gnustep.make}/share/GNUstep/Makefiles" + ]; installFlags = [ "security_INSTALL_DIR=\$(out)/bin" @@ -50,7 +54,7 @@ stdenv.mkDerivation rec { __propagatedImpureHostDeps = [ "/System/Library/Keychains" ]; buildInputs = [ - gnustep-make + gnustep.make libsecurity_asn1 libsecurity_utilities libsecurity_cdsa_utilities |