about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorSilvan Mosberger <infinisil@icloud.com>2019-04-22 23:45:58 +0200
committerGitHub <noreply@github.com>2019-04-22 23:45:58 +0200
commita73f3c801f2ce7d629572038586e341f14ba2b9a (patch)
tree91a6907009347a544e8f69bbcda9716bd78439dd /pkgs
parentd0e70ac2d3f258de46165ae6b56ce33680832125 (diff)
parent81176f43146de7555f692477d2c277e3227bd382 (diff)
downloadnixlib-a73f3c801f2ce7d629572038586e341f14ba2b9a.tar
nixlib-a73f3c801f2ce7d629572038586e341f14ba2b9a.tar.gz
nixlib-a73f3c801f2ce7d629572038586e341f14ba2b9a.tar.bz2
nixlib-a73f3c801f2ce7d629572038586e341f14ba2b9a.tar.lz
nixlib-a73f3c801f2ce7d629572038586e341f14ba2b9a.tar.xz
nixlib-a73f3c801f2ce7d629572038586e341f14ba2b9a.tar.zst
nixlib-a73f3c801f2ce7d629572038586e341f14ba2b9a.zip
Merge pull request #59942 from erictapen/neopg-0.0.5
neopg: 0.0.4 -> 0.0.6
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/security/neopg/default.nix14
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/tools/security/neopg/default.nix b/pkgs/tools/security/neopg/default.nix
index cf5f760cda47..88494e8dbdf7 100644
--- a/pkgs/tools/security/neopg/default.nix
+++ b/pkgs/tools/security/neopg/default.nix
@@ -3,7 +3,7 @@
 , cmake
 , sqlite
 , botan2
-, boost164
+, boost
 , curl
 , gettext
 , pkgconfig
@@ -12,26 +12,26 @@
 
 stdenv.mkDerivation rec {
   name = "neopg-${version}";
-  version = "0.0.4";
+  version = "0.0.6";
 
   src = fetchFromGitHub {
     owner = "das-labor";
     repo = "neopg";
     rev = "v${version}";
-    sha256 = "0hhkl326ff6f76k8pwggpzmivbm13fz497nlyy6ybn5bmi9xfblm";
+    sha256 = "15xp5w046ix59cfrhh8ka4camr0d8qqw643g184sqrcqwpk7nbrx";
     fetchSubmodules = true;
   };
 
   nativeBuildInputs = [ pkgconfig ];
 
-  buildInputs = [ cmake sqlite botan2 boost164 curl gettext libusb gnutls ];
+  buildInputs = [ cmake sqlite botan2 boost curl gettext libusb gnutls ];
 
   doCheck = true;
   checkTarget = "test";
+  dontUseCmakeBuildDir = true;
 
-  postInstall = ''
-    mkdir -p $out/bin
-    cp src/neopg $out/bin/neopg
+  preCheck = ''
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/3rdparty/googletest/googletest:$(pwd)/neopg
   '';
 
   meta = with stdenv.lib; {