mirror of
https://github.com/rzuasti/oott.git
synced 2026-07-08 19:21:54 +02:00
Rollback to single nix package for backend
This commit is contained in:
@@ -1 +0,0 @@
|
|||||||
# OOTT
|
|
||||||
@@ -55,7 +55,7 @@
|
|||||||
});
|
});
|
||||||
|
|
||||||
# A Nixpkgs overlay that provides a 'oott' package.
|
# A Nixpkgs overlay that provides a 'oott' package.
|
||||||
overlays.default = final: prev: {oott = final.callPackage ./nix/package.nix {inherit pkgsBySystem;};};
|
overlays.default = final: prev: {oott = final.callPackage ./nix/package.nix {};};
|
||||||
|
|
||||||
# Package definition
|
# Package definition
|
||||||
packages = forEachSystem (system: {
|
packages = forEachSystem (system: {
|
||||||
|
|||||||
+5
-56
@@ -1,63 +1,12 @@
|
|||||||
{
|
{pkgs}:
|
||||||
lib,
|
pkgs.rustPlatform.buildRustPackage rec {
|
||||||
pkgsBySystem,
|
pname = "oott";
|
||||||
}: let
|
|
||||||
system = "x86_64-linux";
|
|
||||||
pkgs = pkgsBySystem.${system};
|
|
||||||
androidSdk = pkgs.androidenv.androidPkgs.androidsdk;
|
|
||||||
|
|
||||||
oott-frontend = pkgs.stdenv.mkDerivation {
|
|
||||||
name = "oott-frontend";
|
|
||||||
version = "0.0.1";
|
|
||||||
src = ./../frontend;
|
|
||||||
doCheck = false;
|
|
||||||
dontFixup = true;
|
|
||||||
|
|
||||||
ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk";
|
|
||||||
|
|
||||||
nativeBuildInputs = [pkgs.cacert];
|
|
||||||
|
|
||||||
buildInputs = with pkgs; [
|
|
||||||
openssl
|
|
||||||
flutter
|
|
||||||
android-tools
|
|
||||||
androidSdk
|
|
||||||
jdk17
|
|
||||||
];
|
|
||||||
|
|
||||||
buildPhase = ''
|
|
||||||
runHook preBuild
|
|
||||||
mkdir -p $out/web
|
|
||||||
HOME=$out flutter build web
|
|
||||||
cp -r build/web/* $out/web/
|
|
||||||
runHook postBuild
|
|
||||||
'';
|
|
||||||
|
|
||||||
outputHashAlgo = "sha256";
|
|
||||||
outputHashMode = "recursive";
|
|
||||||
outputHash = "sha256-CyFxZMFL9WAklny0XwM6CGrt38NzSYT1xGdXaLSVePI=";
|
|
||||||
# outputHash = pkgs.lib.fakeHash;
|
|
||||||
};
|
|
||||||
|
|
||||||
oott-backend = pkgs.rustPlatform.buildRustPackage {
|
|
||||||
pname = "oott-backend";
|
|
||||||
version = "0.0.1";
|
version = "0.0.1";
|
||||||
src = ./../backend;
|
src = ./../backend;
|
||||||
cargoLock = {
|
cargoLock = {
|
||||||
lockFile = ./../backend/Cargo.lock;
|
lockFile = ./../backend/Cargo.lock;
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [pkgs.pkg-config];
|
nativeBuildInputs = [pkgs.pkg-config];
|
||||||
PKG_CONFIG_PATH = "${pkgs.openssl.dev}/lib/pkgconfig";
|
PKG_CONFIG_PATH = "${pkgs.openssl.dev}/lib/pkgconfig";
|
||||||
};
|
}
|
||||||
in
|
|
||||||
pkgs.stdenv.mkDerivation {
|
|
||||||
name = "oott";
|
|
||||||
buildInputs = [oott-frontend oott-backend];
|
|
||||||
src = ./../extras;
|
|
||||||
installPhase = ''
|
|
||||||
mkdir -p $out/bin
|
|
||||||
mkdir -p $out/web
|
|
||||||
cp -r ${oott-backend}/bin/* $out/bin/
|
|
||||||
cp -r ${oott-frontend}/web/* $out/web/
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user