colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #212891 from abathur/oil_0.14.0

Browse Source 
oil: 0.12.9 -> 0.14.0
This commit is contained in:
Thomas Gerbet 2023-01-28 20:22:39 +01:00 committed by GitHub
commit e49997b90c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/shells/oil/default.nix
View File

@ -1,16 +1,24 @@
{ stdenv, lib, fetchurl, withReadline ? true, readline }:
{ stdenv, lib, fetchurl, symlinkJoin, withReadline ? true, readline }:
let
readline-all = symlinkJoin {
name = "readline-all"; paths = [ readline readline.dev ];
};
in
stdenv.mkDerivation rec {
pname = "oil";
version = "0.12.9";
version = "0.14.0";
src = fetchurl {
url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
hash = "sha256-HY/SZiVOfOrA69gGxEp+qdRnuTJ72XveAk9Xp45zcf8=";
hash = "sha256-ZrT2vHfbc0S9Q9e9lDiyptfSC3CIiQs8Co9FODil7oY=";
};
postPatch = ''
patchShebangs build
# TODO: workaround for https://github.com/oilshell/oil/issues/1467
# check for removability on updates :)
substituteInPlace configure --replace "echo '#define HAVE_READLINE 1'" "echo '#define HAVE_READLINE 1' && return 0"
'';
preInstall = ''
@ -19,7 +27,12 @@ stdenv.mkDerivation rec {
strictDeps = true;
buildInputs = lib.optional withReadline readline;
configureFlags = lib.optional withReadline "--with-readline";
configureFlags = [
"--datarootdir=${placeholder "out"}"
] ++ lib.optionals withReadline [
"--with-readline"
"--readline=${readline-all}"
];
# Stripping breaks the bundles by removing the zip file from the end.
dontStrip = true;