type err fix
This commit is contained in:
parent
bda6d0c689
commit
3d9deb544d
1 changed files with 20 additions and 20 deletions
40
flake.nix
40
flake.nix
|
@ -5,24 +5,25 @@
|
||||||
outputs = {nixpkgs, ...}: let
|
outputs = {nixpkgs, ...}: let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
pkgs = nixpkgs.legacyPackages.${system};
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
pkg = pkgs.stdenv.mkDerivation {
|
pkg = {pkgs, ...}:
|
||||||
name = "jank-client";
|
pkgs.stdenv.mkDerivation {
|
||||||
src = ./.;
|
name = "jank-client";
|
||||||
nativeBuildInputs = [
|
src = ./.;
|
||||||
pkgs.compose2nix
|
nativeBuildInputs = [
|
||||||
];
|
pkgs.compose2nix
|
||||||
buildPhase = ''
|
];
|
||||||
echo "#!/usr/bin/env bash" > start-server
|
buildPhase = ''
|
||||||
echo "systemctl start docker-build-jank-client-jank.service" >> start-server
|
echo "#!/usr/bin/env bash" > start-server
|
||||||
echo "systemctl restart docker-jank-client-jank.service" >> start-server
|
echo "systemctl start docker-build-jank-client-jank.service" >> start-server
|
||||||
'';
|
echo "systemctl restart docker-jank-client-jank.service" >> start-server
|
||||||
installPhase = ''
|
'';
|
||||||
mkdir $out/bin -p
|
installPhase = ''
|
||||||
mkdir $out/src -p
|
mkdir $out/bin -p
|
||||||
cp start-server $out/bin/jank-client
|
mkdir $out/src -p
|
||||||
cp . $out/src -r
|
cp start-server $out/bin/jank-client
|
||||||
'';
|
cp . $out/src -r
|
||||||
};
|
'';
|
||||||
|
};
|
||||||
in {
|
in {
|
||||||
packages.${system}.default = pkg;
|
packages.${system}.default = pkg;
|
||||||
nixosModules.${system}.default = {
|
nixosModules.${system}.default = {
|
||||||
|
@ -48,8 +49,7 @@
|
||||||
config = lib.mkIf config.services.jank-client.enable {
|
config = lib.mkIf config.services.jank-client.enable {
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
(lib.getExe
|
(lib.getExe
|
||||||
(pkgs.callPackage
|
config.services.jank-client.package)
|
||||||
config.services.jank-client.package))
|
|
||||||
];
|
];
|
||||||
virtualisation.docker = {
|
virtualisation.docker = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue