From 5cb16c34a8c5b803ec723934c1dc828c0e8e3bad Mon Sep 17 00:00:00 2001 From: Chris Wells Date: Tue, 10 Sep 2024 11:52:55 -0500 Subject: Trying to get everything to actually work --- pkgs/firmware/default.nix | 6 +++--- pkgs/kfmon/default.nix | 3 +-- pkgs/koreader/default.nix | 3 +-- pkgs/misc/install.nix | 10 ++++++++++ pkgs/plato/default.nix | 3 +-- 5 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 pkgs/misc/install.nix (limited to 'pkgs') diff --git a/pkgs/firmware/default.nix b/pkgs/firmware/default.nix index 9c70eb1..8403abb 100644 --- a/pkgs/firmware/default.nix +++ b/pkgs/firmware/default.nix @@ -39,10 +39,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir $out - cp -r $src/{manifest.md5sum,upgrade} $out/ + cp -r $src $out + rm $out/KoboRoot.tgz - mkdir $KoboRoot + mkdir $KoboROot tar xvzf $src/KoboRoot.tgz --directory=$KoboRoot runHook postInstall diff --git a/pkgs/kfmon/default.nix b/pkgs/kfmon/default.nix index 371c90f..20addac 100644 --- a/pkgs/kfmon/default.nix +++ b/pkgs/kfmon/default.nix @@ -12,7 +12,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { outputs = [ "out" "KoboRoot" - "png" ]; phases = "installPhase"; @@ -26,7 +25,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { mkdir $KoboRoot tar xvzf $src/.kobo/KoboRoot.tgz --directory=$KoboRoot - cp $src/kfmon.png $png + install -D -t $KoboRoot/mnt/onboard $src/kfmon.png runHook postInstall ''; diff --git a/pkgs/koreader/default.nix b/pkgs/koreader/default.nix index 3f185b7..9427fe1 100644 --- a/pkgs/koreader/default.nix +++ b/pkgs/koreader/default.nix @@ -12,7 +12,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { outputs = [ "out" "KoboRoot" - "png" ]; phases = "installPhase"; @@ -24,7 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { mkdir $KoboRoot - cp $src/koreader.png $png + install -D -t $KoboRoot/mnt/onboard $src/koreader.png runHook postInstall ''; diff --git a/pkgs/misc/install.nix b/pkgs/misc/install.nix new file mode 100644 index 0000000..ef5dd86 --- /dev/null +++ b/pkgs/misc/install.nix @@ -0,0 +1,10 @@ +{ writeShellApplication, kobo-utils, ... }: +writeShellApplication { + name = "kobo-install"; + runtimeInputs = [ + kobo-utils + ]; + text = '' + echo "hi" + ''; +} diff --git a/pkgs/plato/default.nix b/pkgs/plato/default.nix index 548363b..6246f2b 100644 --- a/pkgs/plato/default.nix +++ b/pkgs/plato/default.nix @@ -22,7 +22,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { outputs = [ "out" "KoboRoot" - "png" ]; phases = "installPhase"; @@ -34,7 +33,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { mkdir $KoboRoot - cp $picSrc/artworks/plato.png $png + install -D -t $KoboRoot/mnt/onboard $picSrc/artworks/plato.png runHook postInstall ''; -- cgit v1.2.3