diff --git a/pkgs/applications/misc/oil/default.nix b/pkgs/applications/misc/oil-buku/default.nix similarity index 82% rename from pkgs/applications/misc/oil/default.nix rename to pkgs/applications/misc/oil-buku/default.nix index 173cea2ee1c..e0c05488288 100644 --- a/pkgs/applications/misc/oil/default.nix +++ b/pkgs/applications/misc/oil-buku/default.nix @@ -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 = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b53cd08292..ce12eea2877 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3632,7 +3632,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 {};