From 86062d7a952c9e8cdb0b370cedf1b010e0864bb4 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Fri, 13 Mar 2015 12:00:10 +0100 Subject: [PATCH] Adapt code according to @lethalman's review - Use ${bash}/bin/bash - We cannot use oraclejre7 because sqldeveloper wants a jdk. --- pkgs/development/tools/database/sqldeveloper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 031c004ef52..9a0afdc8e1d 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, requireFile, unzip, oraclejdk7}: +{ stdenv, makeWrapper, requireFile, unzip, oraclejdk7, bash}: stdenv.mkDerivation rec { version = "4.0.3.16.84"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildCommand = '' mkdir -p $out/bin # patch to be able to install a sqldeveloper wrapper script compliant with nix's bin folder once installed - echo -e '#!/bin/bash\ncd "`dirname $0`"/../sqldeveloper/bin && bash sqldeveloper $*' >> $out/bin/sqldeveloper + echo -e '#!${bash}/bin/bash\ncd "`dirname $0`"/../sqldeveloper/bin && ${bash}/bin/bash sqldeveloper $*' >> $out/bin/sqldeveloper cd $out unzip ${src}