From b6d0c1eb18e2d7704989029b77ce3e6074a72b35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> Date: Mon, 10 Jul 2017 08:51:15 +0100 Subject: [PATCH] libargon2: do not override pre/postInstall hook --- pkgs/development/libraries/libargon2/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/development/libraries/libargon2/default.nix index 68df0a288fc8..79cbf09317cf 100644 --- a/pkgs/development/libraries/libargon2/default.nix +++ b/pkgs/development/libraries/libargon2/default.nix @@ -3,6 +3,7 @@ stdenv.mkDerivation rec { name = "libargon2-${version}"; version = "20161029"; + src = fetchFromGitHub { owner = "P-H-C"; repo = "phc-winner-argon2"; @@ -11,14 +12,16 @@ stdenv.mkDerivation rec { }; installPhase = '' - mkdir -p $out - make install PREFIX=$out + 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 ln -s $out/lib/libargon2.so $out/lib/libargon2.so.0 + runHook postInstall ''; meta = with stdenv.lib; {