From 9baa4280ed94f4e169fa4718fe56e416d42c40e5 Mon Sep 17 00:00:00 2001 From: Colin Date: Sun, 1 Sep 2024 12:11:30 +0000 Subject: [PATCH] libayatana-indicator: move to pkgs/by-name --- .../li/libayatana-indicator/package.nix} | 17 ++++++++++++----- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 12 insertions(+), 7 deletions(-) rename pkgs/{development/libraries/libayatana-indicator/default.nix => by-name/li/libayatana-indicator/package.nix} (83%) diff --git a/pkgs/development/libraries/libayatana-indicator/default.nix b/pkgs/by-name/li/libayatana-indicator/package.nix similarity index 83% rename from pkgs/development/libraries/libayatana-indicator/default.nix rename to pkgs/by-name/li/libayatana-indicator/package.nix index 0cadea9f9902..9e6f58ca7527 100644 --- a/pkgs/development/libraries/libayatana-indicator/default.nix +++ b/pkgs/by-name/li/libayatana-indicator/package.nix @@ -1,7 +1,11 @@ -{ stdenv, fetchFromGitHub, lib -, pkg-config, cmake -, gtk3 -, ayatana-ido +{ + ayatana-ido, + cmake, + fetchFromGitHub, + gtk3, + lib, + pkg-config, + stdenv, }: stdenv.mkDerivation rec { @@ -15,7 +19,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-OsguZ+jl274uPSCTFHq/ZwUE3yHR7MlUPHCpfmn1F7A="; }; - nativeBuildInputs = [ pkg-config cmake ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; buildInputs = [ gtk3 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d2cff810b40..66c4c0b7a525 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21627,8 +21627,6 @@ with pkgs; libindicator-gtk3 = libindicator.override { gtkVersion = "3"; }; libindicator = callPackage ../development/libraries/libindicator { }; - libayatana-indicator = callPackage ../development/libraries/libayatana-indicator { }; - libinotify-kqueue = callPackage ../development/libraries/libinotify-kqueue { }; libiodbc = callPackage ../development/libraries/libiodbc {