haskellPackages.HsOpenSSL-x509-system: fix Mac runtime (#450225)
This commit is contained in:
@@ -90,7 +90,7 @@ self: super:
|
|||||||
drv:
|
drv:
|
||||||
lib.optionalAttrs (!pkgs.stdenv.cc.nativeLibc) {
|
lib.optionalAttrs (!pkgs.stdenv.cc.nativeLibc) {
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security
|
substituteInPlace System/X509/MacOS.hs --replace-fail security /usr/bin/security
|
||||||
''
|
''
|
||||||
+ (drv.postPatch or "");
|
+ (drv.postPatch or "");
|
||||||
}
|
}
|
||||||
@@ -99,11 +99,20 @@ self: super:
|
|||||||
drv:
|
drv:
|
||||||
lib.optionalAttrs (!pkgs.stdenv.cc.nativeLibc) {
|
lib.optionalAttrs (!pkgs.stdenv.cc.nativeLibc) {
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security
|
substituteInPlace System/X509/MacOS.hs --replace-fail security /usr/bin/security
|
||||||
''
|
''
|
||||||
+ (drv.postPatch or "");
|
+ (drv.postPatch or "");
|
||||||
}
|
}
|
||||||
) super.crypton-x509-system;
|
) super.crypton-x509-system;
|
||||||
|
HsOpenSSL-x509-system = overrideCabal (
|
||||||
|
drv:
|
||||||
|
lib.optionalAttrs (!pkgs.stdenv.cc.nativeLibc) {
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace OpenSSL/X509/SystemStore/MacOSX.hs --replace-fail security /usr/bin/security
|
||||||
|
''
|
||||||
|
+ (drv.postPatch or "");
|
||||||
|
}
|
||||||
|
) super.HsOpenSSL-x509-system;
|
||||||
|
|
||||||
# https://github.com/haskell-foundation/foundation/pull/412
|
# https://github.com/haskell-foundation/foundation/pull/412
|
||||||
foundation = dontCheck super.foundation;
|
foundation = dontCheck super.foundation;
|
||||||
@@ -120,7 +129,7 @@ self: super:
|
|||||||
# when called from GHC, probably because clang is version 7, but we are
|
# when called from GHC, probably because clang is version 7, but we are
|
||||||
# using LLVM8.
|
# using LLVM8.
|
||||||
preCompileBuildDriver = ''
|
preCompileBuildDriver = ''
|
||||||
substituteInPlace Setup.hs --replace "addToLdLibraryPath libDir" "pure ()"
|
substituteInPlace Setup.hs --replace-fail "addToLdLibraryPath libDir" "pure ()"
|
||||||
''
|
''
|
||||||
+ (oldAttrs.preCompileBuildDriver or "");
|
+ (oldAttrs.preCompileBuildDriver or "");
|
||||||
}) super.llvm-hs;
|
}) super.llvm-hs;
|
||||||
@@ -161,7 +170,7 @@ self: super:
|
|||||||
HTF = overrideCabal (drv: {
|
HTF = overrideCabal (drv: {
|
||||||
# GNU find is not prefixed in stdenv
|
# GNU find is not prefixed in stdenv
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace scripts/local-htfpp --replace "find=gfind" "find=find"
|
substituteInPlace scripts/local-htfpp --replace-fail "find=gfind" "find=find"
|
||||||
''
|
''
|
||||||
+ (drv.postPatch or "");
|
+ (drv.postPatch or "");
|
||||||
}) super.HTF;
|
}) super.HTF;
|
||||||
@@ -181,7 +190,7 @@ self: super:
|
|||||||
# however linking against it is also not necessary there
|
# however linking against it is also not necessary there
|
||||||
GLHUI = overrideCabal (drv: {
|
GLHUI = overrideCabal (drv: {
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace GLHUI.cabal --replace " rt" ""
|
substituteInPlace GLHUI.cabal --replace-fail " rt" ""
|
||||||
''
|
''
|
||||||
+ (drv.postPatch or "");
|
+ (drv.postPatch or "");
|
||||||
}) super.GLHUI;
|
}) super.GLHUI;
|
||||||
@@ -190,7 +199,7 @@ self: super:
|
|||||||
# Prevent darwin-specific configuration code path being taken
|
# Prevent darwin-specific configuration code path being taken
|
||||||
# which doesn't work with nixpkgs' SDL libraries
|
# which doesn't work with nixpkgs' SDL libraries
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace configure --replace xDarwin noDarwinSpecialCasing
|
substituteInPlace configure --replace-fail xDarwin noDarwinSpecialCasing
|
||||||
''
|
''
|
||||||
+ (drv.postPatch or "");
|
+ (drv.postPatch or "");
|
||||||
patches = [
|
patches = [
|
||||||
@@ -203,7 +212,7 @@ self: super:
|
|||||||
# doesn't work with nixpkgs' SDL libraries
|
# doesn't work with nixpkgs' SDL libraries
|
||||||
SDL-mixer = overrideCabal (drv: {
|
SDL-mixer = overrideCabal (drv: {
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace configure --replace xDarwin noDarwinSpecialCasing
|
substituteInPlace configure --replace-fail xDarwin noDarwinSpecialCasing
|
||||||
''
|
''
|
||||||
+ (drv.postPatch or "");
|
+ (drv.postPatch or "");
|
||||||
}) super.SDL-mixer;
|
}) super.SDL-mixer;
|
||||||
@@ -309,7 +318,7 @@ self: super:
|
|||||||
# Remove a problematic assert, the length is sometimes 1 instead of 2 on darwin
|
# Remove a problematic assert, the length is sometimes 1 instead of 2 on darwin
|
||||||
di-core = overrideCabal (drv: {
|
di-core = overrideCabal (drv: {
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
substituteInPlace test/Main.hs --replace \
|
substituteInPlace test/Main.hs --replace-fail \
|
||||||
"2 @=? List.length (List.nub (List.sort (map Di.log_time logs)))" ""
|
"2 @=? List.length (List.nub (List.sort (map Di.log_time logs)))" ""
|
||||||
'';
|
'';
|
||||||
}) super.di-core;
|
}) super.di-core;
|
||||||
|
|||||||
Reference in New Issue
Block a user