JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #125004 from hlolli/lowdown-darwin

Browse Source 
lowdown: fix aarch64-darwin by removing deprecated sandbox
This commit is contained in:
Domen Kožar 2021-05-31 09:20:31 +02:00 committed by GitHub
commit deaa70e29e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/tools/typesetting/lowdown/default.nix
View File

@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ which ] nativeBuildInputs = [ which ]
++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ];
preConfigure = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
echo 'HAVE_SANDBOX_INIT=0' > configure.local
'';
configurePhase = '' configurePhase = ''
runHook preConfigure runHook preConfigure
./configure PREFIX=''${!outputDev} \ ./configure PREFIX=''${!outputDev} \
@ -30,6 +34,14 @@ stdenv.mkDerivation rec {
patches = lib.optional (!stdenv.hostPlatform.isStatic) ./shared.patch; patches = lib.optional (!stdenv.hostPlatform.isStatic) ./shared.patch;
doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform;
installCheckPhase = ''
runHook preInstallCheck
echo '# TEST' > test.md
$out/bin/lowdown test.md
runHook postInstallCheck
'';
doCheck = stdenv.hostPlatform == stdenv.buildPlatform; doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
checkTarget = "regress"; checkTarget = "regress";
@ -41,4 +53,3 @@ stdenv.mkDerivation rec {
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }