From 256ba343a05bc93e576837b75b8739c0fb5ed5cd Mon Sep 17 00:00:00 2001 From: Vika Date: Thu, 26 May 2022 00:12:57 +0300 Subject: Remove redundant naersk-lib override --- flake.nix | 7 +++---- kittybox.nix | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index d437310..165b386 100644 --- a/flake.nix +++ b/flake.nix @@ -21,12 +21,11 @@ nixosModules.default = import ./configuration.nix self; } // forAllSystems (system: let pkgs = nixpkgs.legacyPackages.${system}; - naersk-lib = naersk.lib.${system}.override { - inherit (pkgs) rustc cargo; - }; in { packages = { - kittybox = pkgs.callPackage ./kittybox.nix { inherit naersk-lib; }; + kittybox = pkgs.callPackage ./kittybox.nix { + naersk = naersk.lib.${system}; + }; default = self.packages.${system}.kittybox; }; diff --git a/kittybox.nix b/kittybox.nix index f42884a..ace9203 100644 --- a/kittybox.nix +++ b/kittybox.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, openssl, zlib, pkg-config, protobuf, naersk-lib, lld, mold }: -naersk-lib.buildPackage { +{ stdenv, lib, openssl, zlib, pkg-config, protobuf, naersk, lld, mold }: +naersk.buildPackage { pname = "kittybox"; version = "0.1.0"; -- cgit 1.4.1