From 37e443af61dcbd8939e873ff9ae775ef2e1febec Mon Sep 17 00:00:00 2001 From: Colin Date: Sun, 1 Sep 2024 12:07:10 +0000 Subject: [PATCH] ayatana-ido: move to pkgs/by-name --- .../ay/ayatana-ido/package.nix} | 20 ++++++++++++++----- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 15 insertions(+), 7 deletions(-) rename pkgs/{development/libraries/ayatana-ido/default.nix => by-name/ay/ayatana-ido/package.nix} (75%) diff --git a/pkgs/development/libraries/ayatana-ido/default.nix b/pkgs/by-name/ay/ayatana-ido/package.nix similarity index 75% rename from pkgs/development/libraries/ayatana-ido/default.nix rename to pkgs/by-name/ay/ayatana-ido/package.nix index af3476ce1a69..bef38a42a476 100644 --- a/pkgs/development/libraries/ayatana-ido/default.nix +++ b/pkgs/by-name/ay/ayatana-ido/package.nix @@ -1,6 +1,10 @@ -{ lib, stdenv, fetchFromGitHub -, pkg-config, cmake -, gtk3 +{ + cmake, + fetchFromGitHub, + gtk3, + lib, + pkg-config, + stdenv, }: stdenv.mkDerivation rec { @@ -14,7 +18,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-WEPW9BstDv2k/5dTEDQza3eOQ9bd6CEVvmd817sEPAs="; }; - nativeBuildInputs = [ pkg-config cmake ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; buildInputs = [ gtk3 ]; @@ -22,7 +29,10 @@ stdenv.mkDerivation rec { description = "Ayatana Display Indicator Objects"; homepage = "https://github.com/AyatanaIndicators/ayatana-ido"; changelog = "https://github.com/AyatanaIndicators/ayatana-ido/blob/${version}/ChangeLog"; - license = [ licenses.lgpl3Plus licenses.lgpl21Plus ]; + license = [ + licenses.lgpl3Plus + licenses.lgpl21Plus + ]; maintainers = [ maintainers.nickhu ]; platforms = platforms.linux; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1352af0af5c4..1d2cff810b40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19437,8 +19437,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreAudio AudioToolbox; }; - ayatana-ido = callPackage ../development/libraries/ayatana-ido { }; - ayatana-webmail = callPackage ../applications/networking/mailreaders/ayatana-webmail { }; azmq = callPackage ../development/libraries/azmq { };