From 7c5948b7f99f1cd23e9c074976653e20baa0da45 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 24 Nov 2024 12:51:40 +0100 Subject: [PATCH] nvc: move to pkgs/by-name --- .../electronics/nvc/default.nix => by-name/nv/nvc/package.nix} | 3 +++ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) rename pkgs/{applications/science/electronics/nvc/default.nix => by-name/nv/nvc/package.nix} (92%) diff --git a/pkgs/applications/science/electronics/nvc/default.nix b/pkgs/by-name/nv/nvc/package.nix similarity index 92% rename from pkgs/applications/science/electronics/nvc/default.nix rename to pkgs/by-name/nv/nvc/package.nix index 0ec5dcb683a5..7f865f6af2f0 100644 --- a/pkgs/applications/science/electronics/nvc/default.nix +++ b/pkgs/by-name/nv/nvc/package.nix @@ -11,6 +11,7 @@ , llvm , zlib , zstd +, apple-sdk_11 }: stdenv.mkDerivation rec { @@ -39,6 +40,8 @@ stdenv.mkDerivation rec { zstd ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_11 ]; preConfigure = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df20c08d69d0..0e6b43d2b8f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18030,8 +18030,6 @@ with pkgs; withNgshared = false; }; - nvc = darwin.apple_sdk_11_0.callPackage ../applications/science/electronics/nvc { }; - openems = callPackage ../applications/science/electronics/openems { qcsxcad = libsForQt5.qcsxcad; };