diff --git a/pkgs/development/libraries/ayatana-ido/default.nix b/pkgs/by-name/ay/ayatana-ido/package.nix similarity index 70% rename from pkgs/development/libraries/ayatana-ido/default.nix rename to pkgs/by-name/ay/ayatana-ido/package.nix index af3476ce1a69..ae8f9419fb89 100644 --- a/pkgs/development/libraries/ayatana-ido/default.nix +++ b/pkgs/by-name/ay/ayatana-ido/package.nix @@ -1,6 +1,11 @@ -{ lib, stdenv, fetchFromGitHub -, pkg-config, cmake -, gtk3 +{ + cmake, + fetchFromGitHub, + glib, + gtk3, + lib, + pkg-config, + stdenv, }: stdenv.mkDerivation rec { @@ -14,15 +19,24 @@ stdenv.mkDerivation rec { sha256 = "sha256-WEPW9BstDv2k/5dTEDQza3eOQ9bd6CEVvmd817sEPAs="; }; - nativeBuildInputs = [ pkg-config cmake ]; + nativeBuildInputs = [ + cmake + glib # for glib-mkenums + pkg-config + ]; buildInputs = [ gtk3 ]; + strictDeps = true; + meta = with lib; { 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/development/libraries/libayatana-indicator/default.nix b/pkgs/by-name/li/libayatana-indicator/package.nix similarity index 78% rename from pkgs/development/libraries/libayatana-indicator/default.nix rename to pkgs/by-name/li/libayatana-indicator/package.nix index 0cadea9f9902..852c61d3ea13 100644 --- a/pkgs/development/libraries/libayatana-indicator/default.nix +++ b/pkgs/by-name/li/libayatana-indicator/package.nix @@ -1,7 +1,12 @@ -{ stdenv, fetchFromGitHub, lib -, pkg-config, cmake -, gtk3 -, ayatana-ido +{ + ayatana-ido, + cmake, + fetchFromGitHub, + glib, + gtk3, + lib, + pkg-config, + stdenv, }: stdenv.mkDerivation rec { @@ -15,12 +20,18 @@ stdenv.mkDerivation rec { sha256 = "sha256-OsguZ+jl274uPSCTFHq/ZwUE3yHR7MlUPHCpfmn1F7A="; }; - nativeBuildInputs = [ pkg-config cmake ]; + nativeBuildInputs = [ + cmake + glib # for glib-mkenums + pkg-config + ]; buildInputs = [ gtk3 ]; propagatedBuildInputs = [ ayatana-ido ]; + strictDeps = true; + meta = with lib; { description = "Ayatana Indicators Shared Library"; homepage = "https://github.com/AyatanaIndicators/libayatana-indicator"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 712713ce501b..1df32d91e6f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19359,8 +19359,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 { }; @@ -21536,8 +21534,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 {