oil-buku: improved syntax
This commit is contained in:
parent
062a0c5437
commit
003478830b
|
@ -15,12 +15,6 @@ stdenvNoCC.mkDerivation rec {
|
||||||
substituteInPlace src/oil --replace \
|
substituteInPlace src/oil --replace \
|
||||||
"LIBDIR=/usr/local/lib/oil" "LIBDIR=${placeholder "out"}/lib"
|
"LIBDIR=/usr/local/lib/oil" "LIBDIR=${placeholder "out"}/lib"
|
||||||
|
|
||||||
substituteInPlace Makefile --replace \
|
|
||||||
"LIBDIR ?= /usr/local/lib/oil" "LIBDIR ?= ${placeholder "out"}/lib" \
|
|
||||||
|
|
||||||
substituteInPlace Makefile --replace \
|
|
||||||
"BINDIR ?= /usr/local/bin" "BINDIR ?= ${placeholder "out"}/bin"
|
|
||||||
|
|
||||||
substituteInPlace src/json-to-line.jq --replace \
|
substituteInPlace src/json-to-line.jq --replace \
|
||||||
"/usr/bin/env -S jq" "${jq}/bin/jq"
|
"/usr/bin/env -S jq" "${jq}/bin/jq"
|
||||||
|
|
||||||
|
@ -28,6 +22,11 @@ stdenvNoCC.mkDerivation rec {
|
||||||
"/usr/bin/env -S awk" "${gawk}/bin/awk"
|
"/usr/bin/env -S awk" "${gawk}/bin/awk"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
makeFlags = [
|
||||||
|
"BINDIR=${placeholder "out"}/bin"
|
||||||
|
"LIBDIR=${placeholder "out"}/lib"
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
postFixup = ''
|
postFixup = ''
|
|
@ -3632,7 +3632,7 @@ with pkgs;
|
||||||
|
|
||||||
odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter {};
|
odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter {};
|
||||||
|
|
||||||
oil-buku = callPackage ../applications/misc/oil { };
|
oil-buku = callPackage ../applications/misc/oil-buku { };
|
||||||
|
|
||||||
ossutil = callPackage ../tools/admin/ossutil {};
|
ossutil = callPackage ../tools/admin/ossutil {};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue