git.iko.soy/typeable/nixpkgs
on master help sign in
oil-buku: improved syntax
commit003478830b47b0099c7ebfeb0061f71af7a8814e authorÁtila Saraiva <atilasaraiva@gmail.com> dateTue 15 Feb 2022, 14:32 (5 years ago) parent062a0c5
2 files changed+6−7
compare with master
unifiedsplit
pkgs/applications/misc/oil/default.nix → pkgs/applications/misc/oil-buku/default.nix+5−6 pkgs/top-level/all-packages.nix+1−1
pkgs/applications/misc/oil/default.nix → pkgs/applications/misc/oil-buku/default.nixrenamed+5−6
@@ -15,12 +15,6 @@ stdenvNoCC.mkDerivation rec {
1515 substituteInPlace src/oil --replace \
1616 "LIBDIR=/usr/local/lib/oil" "LIBDIR=${placeholder "out"}/lib"
1717
18− substituteInPlace Makefile --replace \
19− "LIBDIR ?= /usr/local/lib/oil" "LIBDIR ?= ${placeholder "out"}/lib" \
20−
21− substituteInPlace Makefile --replace \
22− "BINDIR ?= /usr/local/bin" "BINDIR ?= ${placeholder "out"}/bin"
23−
2418 substituteInPlace src/json-to-line.jq --replace \
2519 "/usr/bin/env -S jq" "${jq}/bin/jq"
2620
@@ -28,6 +22,11 @@ stdenvNoCC.mkDerivation rec {
2822 "/usr/bin/env -S awk" "${gawk}/bin/awk"
2923 '';
3024
25+ makeFlags = [
26+ "BINDIR=${placeholder "out"}/bin"
27+ "LIBDIR=${placeholder "out"}/lib"
28+ ];
29+
3130 nativeBuildInputs = [ makeWrapper ];
3231
3332 postFixup = ''
pkgs/top-level/all-packages.nix+1−1
@@ -3632,7 +3632,7 @@ with pkgs;
36323632
36333633 odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter {};
36343634
3635− oil-buku = callPackage ../applications/misc/oil { };
3635+ oil-buku = callPackage ../applications/misc/oil-buku { };
36363636
36373637 ossutil = callPackage ../tools/admin/ossutil {};
36383638