xmlsec: fix build on macOS (#101319) · pyrox.dev/nixpkgs@7698197

lol

xmlsec: fix build on macOS (#101319)

* xmlsec: fix build on macOS

xmlsec detects the Darwin platform and uses the -D flag with base64, but nix uses GNU base64 which requires -d.

This patch removes the platform test and always uses the -d flag.

authored by

Caleb Land and committed by

GitHub 5 years ago 76981973 b22433a3

+13 -1

2 changed files

expand all

pkgs

development

libraries

xmlsec

default.nix

remove_bsd_base64_decode_flag.patch

+1 -1

pkgs/development/libraries/xmlsec/default.nix

··· 16 16 17 17 patches = [ 18 18 ./lt_dladdsearchdir.patch 19 - ]; 19 + ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./remove_bsd_base64_decode_flag.patch ]; 20 20 postPatch = '' 21 21 substituteAllInPlace src/dl.c 22 22 '';

+12

pkgs/development/libraries/xmlsec/remove_bsd_base64_decode_flag.patch

··· 1 + --- a/tests/testEnc.sh 2020-04-20 14:30:32.000000000 -0400 2 + +++ b/tests/testEnc.sh 2020-10-21 22:09:25.000000000 -0400 3 + @@ -405,9 +405,6 @@ 4 + else 5 + # generate binary file out of base64 6 + DECODE="-d" 7 + - if [ "`uname`" = "Darwin" ]; then 8 + - DECODE="-D" 9 + - fi 10 + cat "$topfolder/$base_test_name.data" | base64 $DECODE > $tmpfile.3 11 + execEncTest "$res_success" \ 12 + "" \