summary refs log tree commit diff
path: root/pkgs/tools/misc/shallot
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2019-08-21 17:13:09 +0200
committerRobin Gloster <mail@glob.in>2019-08-21 17:13:09 +0200
commitbabb9f0cc101d8451ea3f76f1a138cee51d4f710 (patch)
tree7663f36f38a92b609052e3e52e7804def886a0f8 /pkgs/tools/misc/shallot
parentbbf133d07e999bebb64df8f145c45bdd839ced0c (diff)
downloadnixpkgs-babb9f0cc101d8451ea3f76f1a138cee51d4f710.tar
nixpkgs-babb9f0cc101d8451ea3f76f1a138cee51d4f710.tar.gz
nixpkgs-babb9f0cc101d8451ea3f76f1a138cee51d4f710.tar.bz2
nixpkgs-babb9f0cc101d8451ea3f76f1a138cee51d4f710.tar.lz
nixpkgs-babb9f0cc101d8451ea3f76f1a138cee51d4f710.tar.xz
nixpkgs-babb9f0cc101d8451ea3f76f1a138cee51d4f710.tar.zst
nixpkgs-babb9f0cc101d8451ea3f76f1a138cee51d4f710.zip
shallot: add patches to fix with openssl 1.1
Diffstat (limited to 'pkgs/tools/misc/shallot')
-rw-r--r--pkgs/tools/misc/shallot/default.nix25
1 files changed, 19 insertions, 6 deletions
diff --git a/pkgs/tools/misc/shallot/default.nix b/pkgs/tools/misc/shallot/default.nix
index 6c757ca224a..ced15038b0c 100644
--- a/pkgs/tools/misc/shallot/default.nix
+++ b/pkgs/tools/misc/shallot/default.nix
@@ -1,12 +1,10 @@
-{ 
-  stdenv, fetchFromGitHub,
-  openssl
+{ stdenv, fetchFromGitHub, fetchpatch
+, openssl
 }:
 
-let 
+stdenv.mkDerivation rec {
+  pname = "shallot";
   version = "0.0.3";
-in stdenv.mkDerivation {
-  name = "shallot-${version}";
 
   src = fetchFromGitHub {
     owner = "katmagic";
@@ -17,6 +15,21 @@ in stdenv.mkDerivation {
 
   buildInputs = [ openssl ];
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/katmagic/Shallot/commit/c913088dfaaaf249494514f20a62f2a17b5c6606.patch";
+      sha256 = "19l1ppbxpdb0736f7plhybj08wh6rqk1lr3bxsp8jpzpnkh114b2";
+    })
+    (fetchpatch {
+      url = "https://github.com/katmagic/Shallot/commit/cd6628d97b981325e700a38f408a43df426fd569.patch";
+      sha256 = "1gaffp5wp1l5p2qdk0ix3i5fhzpx4xphl0haa6ajhqn8db7hbr9y";
+    })
+    (fetchpatch {
+      url = "https://github.com/katmagic/Shallot/commit/5c7c1ccecbbad5a121c50ba7153cbbee7ee0ebf9.patch";
+      sha256 = "1zmll4iqz39zwk8vj40n1dpvyq3403l64p2127gsjgh2l2v91s4k";
+    })
+  ];
+
   installPhase = ''
     mkdir -p $out/bin
     cp ./shallot $out/bin/