libargon2: fixed cross-compilation

[vikanezrimaya]

Motivation for this change

Makefile had a hardcoded unprefixed ar. I wrote a patch and added an optional make flag to override it in case we're cross-compiling.

Unfortunately, this causes a rebuild of native packages.

Things done

• Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
• Built on platform(s)
  • NixOS
  • macOS
  • other Linux distributions
• Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
• Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
• Tested execution of all binary files (usually in ./result/bin/)
• Determined the impact on package closure size (by running nix path-info -S before and after)
• Ensured that relevant documentation is up to date
• Fits CONTRIBUTING.md.

Notify maintainers

cc @Radvendii @olynch

[aanderse]

Looks like this patch should be an upstream fix. Can you open a ticket upstream please?

[vikanezrimaya]

@aanderse Done! P-H-C/phc-winner-argon2#277

[aanderse]

That is great you could submit the fix upstream! Thanks!

[vikanezrimaya]

Accidentally forgot to commit stuff when rewriting my commit. Sorry! :3

[vikanezrimaya]

Ugh... I'm so clumsy when it comes to rewriting my pull requests. I'm terribly sorry for overloading OfBorg

[aanderse]

Looking good. Hopefully someone who knows something about cross compilation can approve. Maybe @matthewbauer?

[worldofpeace]

I noticed that the pkgconfig file is handled by the Makefile now, and is currently incorrect.

This patch should fix this

diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/development/libraries/libargon2/default.nix
index 48c94098d58..1441aa5d112 100644
--- a/pkgs/development/libraries/libargon2/default.nix
+++ b/pkgs/development/libraries/libargon2/default.nix
@@ -20,20 +20,13 @@ stdenv.mkDerivation rec {
   ];
 
   # Fix cross-compilation
-  makeFlags = ["AR=${stdenv.cc.targetPrefix}ar"];
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/lib/pkgconfig
-    substitute libargon2.pc $out/lib/pkgconfig/libargon2.pc \
-      --replace @UPSTREAM_VER@ "${version}"                 \
-      --replace @HOST_MULTIARCH@ ""                         \
-      --replace 'prefix=/usr' "prefix=$out"
-
-    make install PREFIX=$out LIBRARY_REL=lib
-    ln -s $out/lib/libargon2.so $out/lib/libargon2.so.0
-    runHook postInstall
-  '';
+  makeFlags = [
+    "AR=${stdenv.cc.targetPrefix}ar"
+    "PREFIX=${placeholder "out"}"
+    "ARGON2_VERSION=${version}"
+    "LIBRARY_REL=lib"
+    "PKGCONFIG_REL=lib"
+  ];
 
   meta = with stdenv.lib; {
     description = "A key derivation function that was selected as the winner of the Password Hashing Competition in July 2015";

Not sure if the ln -s $out/lib/libargon2.so $out/lib/libargon2.so.0 part was needed.

[worldofpeace]

For reference the file currently looks like

# libargon2 info for pkg-config

prefix=/usr
exec_prefix=${prefix}
libdir=${prefix}/lib/x86_64-linux-gnu
includedir=${prefix}/include

Name: libargon2
Description: Development libraries for libargon2
Version: ZERO
Libs: -L${libdir} -largon2 -lrt -ldl
Cflags: -I${includedir}
URL: https://github.com/P-H-C/phc-winner-argon2

I'd expect anything that uses pkgconfig for libargon2 to be broken because of that.

[vikanezrimaya]

@worldofpeace Your patches were successfully assimilated 😸

[worldofpeace]

@worldofpeace Your patches were successfully assimilated smile_cat

Great @kisik21, could you note this change in the commit msg? Or if convenient make it a separate commit.

[vikanezrimaya]

Oops! I've force-pushed it to my commit >.< One second, I'll amend the commit message.

[vikanezrimaya]

Noted the pkg-config fix in the commit message and attributed the patch.

[worldofpeace]

Checked that it cross compiles for: aarch64-multiplatform raspberryPi.