nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-25 17:55:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

oil-buku: improved syntax

Browse Source 
(cherry picked from commit d530f3d3d2)
This commit is contained in:
Átila Saraiva
2022-02-15 14:32:23 -03:00
committed by github-actions[bot]
parent 59a5293102
commit 7678aef363
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/misc/oil/default.nix → pkgs/applications/misc/oil-buku/default.nix
View File

@@ -15,12 +15,6 @@ stdenvNoCC.mkDerivation rec {
substituteInPlace src/oil --replace \
"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 \
"/usr/bin/env -S jq" "${jq}/bin/jq"
@@ -28,6 +22,11 @@ stdenvNoCC.mkDerivation rec {
"/usr/bin/env -S awk" "${gawk}/bin/awk"
'';
makeFlags = [
"BINDIR=${placeholder "out"}/bin"
"LIBDIR=${placeholder "out"}/lib"
];
nativeBuildInputs = [ makeWrapper ];
postFixup = ''

2
pkgs/top-level/all-packages.nix
View File

@@ -3445,7 +3445,7 @@ with pkgs;
odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter {};
oil-buku = callPackage ../applications/misc/oil { };
oil-buku = callPackage ../applications/misc/oil-buku { };
ossutil = callPackage ../tools/admin/ossutil {};