From 1b2f94b0db756c413339e7f9a998a08c0e2be5e2 Mon Sep 17 00:00:00 2001 From: Ryan Cao <70191398+ryanccn@users.noreply.github.com> Date: Fri, 21 Jul 2023 09:27:40 +0800 Subject: [PATCH] move gen-license to overlay --- flake.nix | 7 +++---- overlays/gen-license.nix | 24 ++++++++++++++++++++++++ pkgs/gen-license.nix | 31 ------------------------------- 3 files changed, 27 insertions(+), 35 deletions(-) create mode 100644 overlays/gen-license.nix delete mode 100644 pkgs/gen-license.nix diff --git a/flake.nix b/flake.nix index 3841a76..15c523e 100644 --- a/flake.nix +++ b/flake.nix @@ -48,6 +48,7 @@ environment.systemPackages = with pkgs; [ nil alejandra + nixpkgs-fmt attic-client cachix direnv @@ -80,6 +81,7 @@ gh git git-lfs + gen-license gum helix hyperfine @@ -102,10 +104,6 @@ vivid xh zoxide - - (import ./pkgs/gen-license.nix { - inherit (pkgs) lib stdenv rustPlatform fetchCrate darwin libiconv pkg-config; - }) ]; services.nix-daemon.enable = true; @@ -134,6 +132,7 @@ agenix.overlays.default fenix.overlays.default (import ./overlays/ccache-wrapper.nix) + (import ./overlays/gen-license.nix) ]; config.allowUnfree = true; diff --git a/overlays/gen-license.nix b/overlays/gen-license.nix new file mode 100644 index 0000000..bb5e294 --- /dev/null +++ b/overlays/gen-license.nix @@ -0,0 +1,24 @@ +(_: prev: { + gen-license = prev.rustPlatform.buildRustPackage rec { + pname = "gen-license"; + version = "0.1.2"; + + src = prev.fetchCrate { + inherit pname version; + sha256 = "sha256-YZcycLQ436cjr2YTT7TEyMdeLTOl9oEfa5x3lgnnYyo="; + }; + + cargoLock.lockFile = "${src}/Cargo.lock"; + + buildInputs = + [] + ++ prev.lib.optionals prev.stdenv.isDarwin [ + prev.darwin.apple_sdk_11_0.frameworks.CoreFoundation + prev.darwin.apple_sdk_11_0.frameworks.Security + prev.darwin.IOKit + prev.libiconv + ]; + + nativeBuildInputs = [prev.pkg-config]; + }; +}) diff --git a/pkgs/gen-license.nix b/pkgs/gen-license.nix deleted file mode 100644 index d6190cc..0000000 --- a/pkgs/gen-license.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - stdenv, - rustPlatform, - fetchCrate, - darwin, - libiconv, - pkg-config, -}: -rustPlatform.buildRustPackage rec { - pname = "gen-license"; - version = "0.1.2"; - - src = fetchCrate { - inherit pname version; - sha256 = "sha256-YZcycLQ436cjr2YTT7TEyMdeLTOl9oEfa5x3lgnnYyo="; - }; - - cargoLock.lockFile = "${src}/Cargo.lock"; - - buildInputs = - [] - ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk_11_0.frameworks.CoreFoundation - darwin.apple_sdk_11_0.frameworks.Security - darwin.IOKit - libiconv - ]; - - nativeBuildInputs = [pkg-config]; -}