commit 0bdddd5a53d01eb1a9ad120b4959c9ecdded74b2 parent b263b73244f72a6d2e492fe81c02150899597014 Author: Nikolay Korotkiy <sikmir@disroot.org> Date: Sun, 6 Nov 2022 18:07:51 +0300 Move embox to embedded/ Diffstat:
4 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/pkgs/default.nix b/pkgs/default.nix @@ -98,14 +98,11 @@ lib.makeScope newScope ( ### EMBEDDED chdk = callPackage ./embedded/chdk { }; - - ### EMBOX - - embox-aarch64 = callPackage ./embox { arch = "aarch64"; }; - embox-arm = callPackage ./embox { arch = "arm"; }; - embox-ppc = callPackage ./embox { arch = "ppc"; }; - embox-riscv64 = callPackage ./embox { arch = "riscv64"; }; - embox-x86 = callPackage ./embox { + embox-aarch64 = callPackage ./embedded/embox { arch = "aarch64"; }; + embox-arm = callPackage ./embedded/embox { arch = "arm"; }; + embox-ppc = callPackage ./embedded/embox { arch = "ppc"; }; + embox-riscv64 = callPackage ./embedded/embox { arch = "riscv64"; }; + embox-x86 = callPackage ./embedded/embox { stdenv = pkgs.gccMultiStdenv; }; diff --git a/pkgs/embox/0001-fix-build.patch b/pkgs/embedded/embox/0001-fix-build.patch diff --git a/pkgs/embox/default.nix b/pkgs/embedded/embox/default.nix diff --git a/pkgs/embox/third-party.json b/pkgs/embedded/embox/third-party.json