From 714c0c893dd6f900479dea21ff569a8821bdd820 Mon Sep 17 00:00:00 2001 From: rzuasti Date: Thu, 12 Feb 2026 08:52:01 -0500 Subject: [PATCH] Actually we can do it all from a single package.nix --- flake.nix | 2 +- nix/package-backend.nix | 12 ------------ nix/package.nix | 20 ++++++++++++++++++++ 3 files changed, 21 insertions(+), 13 deletions(-) delete mode 100644 nix/package-backend.nix create mode 100644 nix/package.nix diff --git a/flake.nix b/flake.nix index 98cc6f2..16c9da1 100644 --- a/flake.nix +++ b/flake.nix @@ -55,7 +55,7 @@ }); # A Nixpkgs overlay that provides a 'oott' package. - overlays.default = final: prev: {oott = final.callPackage ./nix/package-backend.nix {};}; + overlays.default = final: prev: {oott = final.callPackage ./nix/package.nix {};}; # Package definition packages = forEachSystem (system: { diff --git a/nix/package-backend.nix b/nix/package-backend.nix deleted file mode 100644 index 253b17c..0000000 --- a/nix/package-backend.nix +++ /dev/null @@ -1,12 +0,0 @@ -{pkgs}: -pkgs.rustPlatform.buildRustPackage rec { - pname = "oott"; - version = "0.0.1"; - src = ./../backend; - cargoLock = { - lockFile = ./../backend/Cargo.lock; - }; - - nativeBuildInputs = [pkgs.pkg-config]; - PKG_CONFIG_PATH = "${pkgs.openssl.dev}/lib/pkgconfig"; -} diff --git a/nix/package.nix b/nix/package.nix new file mode 100644 index 0000000..9d40a18 --- /dev/null +++ b/nix/package.nix @@ -0,0 +1,20 @@ +{pkgs}: let + oott-backend = pkgs.rustPlatform.buildRustPackage rec { + pname = "oott-backend"; + version = "0.0.1"; + src = ./../backend; + cargoLock = { + lockFile = ./../backend/Cargo.lock; + }; + + nativeBuildInputs = [pkgs.pkg-config]; + PKG_CONFIG_PATH = "${pkgs.openssl.dev}/lib/pkgconfig"; + }; +in + pkgs.stdenv.mkDerivation { + name = "oott"; + buildInputs = [oott-backend]; + installPhase = '' + cp ${oott-backend}/bin/* $out/bin/ + ''; + }