From 79736a4a0aefe7279b02273319b42cc1856dca33 Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 3 Feb 2024 16:27:35 +0000 Subject: [PATCH] koreader-from-src: tidy --- pkgs/additional/koreader-from-src/default.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/additional/koreader-from-src/default.nix b/pkgs/additional/koreader-from-src/default.nix index f9518870..b032a4be 100644 --- a/pkgs/additional/koreader-from-src/default.nix +++ b/pkgs/additional/koreader-from-src/default.nix @@ -163,7 +163,7 @@ stdenv.mkDerivation rec { dontConfigure = true; buildPhase = '' - install_lib() { + link_lib_src() { lib="$1" rev="$2" platform="$3" @@ -208,16 +208,16 @@ stdenv.mkDerivation rec { chmod u+w -R "$prefix/src/$lib" } - '' + builtins.concatStringsSep "\n" (lib.mapAttrsToList - (name: src: - let - # for machine-agnostic libraries (e.g. pure lua), koreader doesn't build them in a flavored directory - machine = if src.machineAgnostic or false then "" else stdenv.hostPlatform.config; - in - ''install_lib "${name}" "${src.source.rev}" "${machine}"'' - ) - sources.thirdparty - ) + '' + ${builtins.concatStringsSep "\n" (lib.mapAttrsToList + (name: src: + let + # for machine-agnostic libraries (e.g. pure lua), koreader doesn't build them in a flavored directory + machine = if src.machineAgnostic or false then "" else stdenv.hostPlatform.config; + in + ''link_lib_src "${name}" "${src.source.rev}" "${machine}"'' + ) + sources.thirdparty + )} make TARGET=${target} DEBIAN=1 SHELL=sh VERBOSE=1 '';