From 37e443af61dcbd8939e873ff9ae775ef2e1febec Mon Sep 17 00:00:00 2001 From: Colin Date: Sun, 1 Sep 2024 12:07:10 +0000 Subject: [PATCH 1/4] 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 { }; From e272eb2fd75c38299905032fb1d3086021f7bd47 Mon Sep 17 00:00:00 2001 From: Colin Date: Sun, 1 Sep 2024 12:10:22 +0000 Subject: [PATCH 2/4] ayatana-ido: fix cross compilation --- pkgs/by-name/ay/ayatana-ido/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ay/ayatana-ido/package.nix b/pkgs/by-name/ay/ayatana-ido/package.nix index bef38a42a476..ae8f9419fb89 100644 --- a/pkgs/by-name/ay/ayatana-ido/package.nix +++ b/pkgs/by-name/ay/ayatana-ido/package.nix @@ -1,6 +1,7 @@ { cmake, fetchFromGitHub, + glib, gtk3, lib, pkg-config, @@ -20,11 +21,14 @@ stdenv.mkDerivation rec { 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"; From 9baa4280ed94f4e169fa4718fe56e416d42c40e5 Mon Sep 17 00:00:00 2001 From: Colin Date: Sun, 1 Sep 2024 12:11:30 +0000 Subject: [PATCH 3/4] 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 { From 8e2f23d65ad4231d7bf3b6764cd0408ff2cfa493 Mon Sep 17 00:00:00 2001 From: Colin Date: Sun, 1 Sep 2024 12:13:17 +0000 Subject: [PATCH 4/4] libayatana-indicator: fix cross compilation --- pkgs/by-name/li/libayatana-indicator/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/li/libayatana-indicator/package.nix b/pkgs/by-name/li/libayatana-indicator/package.nix index 9e6f58ca7527..852c61d3ea13 100644 --- a/pkgs/by-name/li/libayatana-indicator/package.nix +++ b/pkgs/by-name/li/libayatana-indicator/package.nix @@ -2,6 +2,7 @@ ayatana-ido, cmake, fetchFromGitHub, + glib, gtk3, lib, pkg-config, @@ -21,6 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake + glib # for glib-mkenums pkg-config ]; @@ -28,6 +30,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ ayatana-ido ]; + strictDeps = true; + meta = with lib; { description = "Ayatana Indicators Shared Library"; homepage = "https://github.com/AyatanaIndicators/libayatana-indicator";