From 1bbf15eca17d3ad1a0652a0cbd8b9f26179a86b2 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sat, 7 Feb 2015 18:45:35 +0100 Subject: [PATCH] Leiningen: Fix GnuPG Support. --- pkgs/development/tools/build-managers/leiningen/builder.sh | 2 +- pkgs/development/tools/build-managers/leiningen/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/leiningen/builder.sh b/pkgs/development/tools/build-managers/leiningen/builder.sh index 885f3189acc..f3dd2bf2c93 100644 --- a/pkgs/development/tools/build-managers/leiningen/builder.sh +++ b/pkgs/development/tools/build-managers/leiningen/builder.sh @@ -19,5 +19,5 @@ patchShebangs $out wrapProgram $out_bin \ --prefix PATH ":" "${rlwrap}/bin:${coreutils}/bin:${findutils}/bin" \ - --set LEIN_GPG ${gnupg}/bin/gpg \ + --set LEIN_GPG ${gnupg1compat}/bin/gpg \ --set JAVA_CMD ${jdk}/bin/java diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 00d8eade612..5fb7d1a6995 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper -, coreutils, findutils, jdk, rlwrap, gnupg }: +, coreutils, findutils, jdk, rlwrap, gnupg1compat }: stdenv.mkDerivation rec { pname = "leiningen"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { patches = [ ./lein-fix-jar-path.patch ]; - inherit rlwrap gnupg findutils coreutils jdk; + inherit rlwrap gnupg1compat findutils coreutils jdk; builder = ./builder.sh;