Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b22433a306ed
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7698197323bc
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 1, 2020

  1. 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.
    @caleb
    caleb authored Nov 1, 2020
    Copy the full SHA
    7698197 View commit details
Showing with 13 additions and 1 deletion.
  1. +1 −1 pkgs/development/libraries/xmlsec/default.nix
  2. +12 −0 pkgs/development/libraries/xmlsec/remove_bsd_base64_decode_flag.patch
2 changes: 1 addition & 1 deletion pkgs/development/libraries/xmlsec/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ stdenv.mkDerivation {

patches = [
./lt_dladdsearchdir.patch
];
] ++ stdenv.lib.optionals stdenv.isDarwin [ ./remove_bsd_base64_decode_flag.patch ];
postPatch = ''
substituteAllInPlace src/dl.c
'';
12 changes: 12 additions & 0 deletions pkgs/development/libraries/xmlsec/remove_bsd_base64_decode_flag.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
--- a/tests/testEnc.sh 2020-04-20 14:30:32.000000000 -0400
+++ b/tests/testEnc.sh 2020-10-21 22:09:25.000000000 -0400
@@ -405,9 +405,6 @@
else
# generate binary file out of base64
DECODE="-d"
- if [ "`uname`" = "Darwin" ]; then
- DECODE="-D"
- fi
cat "$topfolder/$base_test_name.data" | base64 $DECODE > $tmpfile.3
execEncTest "$res_success" \
"" \