From b911e89cf16be7a43257c5128c42bf2b814e29b6 Mon Sep 17 00:00:00 2001
From: Bruno Kirschner <bruno.kirschner@online.de>
Date: Tue, 27 Aug 2019 00:16:13 +0200
Subject: [PATCH] [CI] Fix nix scripts.
---
README.md | 2 +-
default.nix | 4 ++--
release.nix | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index 1bb02120..7b860323 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ https://firmware.card10.badge.events.ccc.de/how-to-build.html this
should work as following:
```shell
-cd c/
+cd card10-sys/firmware
./bootstrap -Djailbreak_card10=true
ninja -C build/
```
diff --git a/default.nix b/default.nix
index 2d1d4119..0b7b5b7e 100644
--- a/default.nix
+++ b/default.nix
@@ -11,7 +11,7 @@ let
};
epic-stubs = stdenv.mkDerivation {
name = "epic-stubs";
- src = ./c;
+ src = ./card10-sys/firmware;
buildInputs = [ gcc python3 ];
buildPhase = ''
${python3}/bin/python epicardium/api/genapi.py -H epicardium/epicardium.h -c client.c -s server.c
@@ -28,7 +28,7 @@ let
cargoSha256 = "10nims5j9r0d7pcfbbj8ycqxhcx7n07958jvkib29b0sf9c6qh3z";
buildInputs = [ pkgsCross.arm-embedded.stdenv.cc ];
prePatch = ''
- cp ${epic-stubs}/client.c l0dable/src/
+ cp ${epic-stubs}/client.c card10-sys/vendor/
'';
NIX_DEBUG=1;
LIBCLANG_PATH="${llvmPackages.libclang}/lib";
diff --git a/release.nix b/release.nix
index e6415f2e..9543cf51 100644
--- a/release.nix
+++ b/release.nix
@@ -13,7 +13,7 @@ let
src = ./.;
phases = [ "unpackPhase" "patchPhase" "installPhase" ];
nativeBuildInputs = [ git ];
- prePatch = "cd c";
+ prePatch = "cd card10-sys/firmware";
patches = [
./0001-feat-nix-add-jailbreak-arg.patch
];
--
GitLab