about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLinus Heckemann <git@sphalerite.org>2019-10-07 12:14:13 +0200
committerGitHub <noreply@github.com>2019-10-07 12:14:13 +0200
commite831ebce93833446ff967986af7948c50f598bfe (patch)
tree2561cf4b9c318a7e064ebcf89648fe2a57f4765a
parent9906b88423c84cbc5a798d88da371bfd67b9366c (diff)
parentfe30f418900c631c2774dd4310e835cdda062050 (diff)
downloadnixlib-e831ebce93833446ff967986af7948c50f598bfe.tar
nixlib-e831ebce93833446ff967986af7948c50f598bfe.tar.gz
nixlib-e831ebce93833446ff967986af7948c50f598bfe.tar.bz2
nixlib-e831ebce93833446ff967986af7948c50f598bfe.tar.lz
nixlib-e831ebce93833446ff967986af7948c50f598bfe.tar.xz
nixlib-e831ebce93833446ff967986af7948c50f598bfe.tar.zst
nixlib-e831ebce93833446ff967986af7948c50f598bfe.zip
Merge pull request #70531 from fjallarefur/oil
oil: enable readline
-rw-r--r--pkgs/shells/oil/default.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix
index 4796cc27391a..c88e012a0c37 100644
--- a/pkgs/shells/oil/default.nix
+++ b/pkgs/shells/oil/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchpatch }:
+{ stdenv, lib, fetchurl, fetchpatch, readline }:
 
 stdenv.mkDerivation rec {
   pname = "oil";
@@ -26,6 +26,9 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
   '';
 
+  buildInputs = [ readline ];
+  configureFlags = [ "--with-readline" ];
+
   # Stripping breaks the bundles by removing the zip file from the end.
   dontStrip = true;
 
@@ -40,4 +43,8 @@ stdenv.mkDerivation rec {
 
     maintainers = with lib.maintainers; [ lheckemann ];
   };
+
+  passthru = {
+      shellPath = "/bin/osh";
+  };
 }