dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

ayatana-ido,libayatana-indicator: move to pkgs/by-name and fix cross compilation (#338790)

Browse Source
This commit is contained in:
Peder Bergebakken Sundt 2024-09-15 23:27:45 +02:00 committed by GitHub
commit d109b34ab6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/libraries/ayatana-ido/default.nix → pkgs/by-name/ay/ayatana-ido/package.nix
View File

@ -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;
};

21
pkgs/development/libraries/libayatana-indicator/default.nix → pkgs/by-name/li/libayatana-indicator/package.nix
View File

@ -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";

4
pkgs/top-level/all-packages.nix
View File

@ -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 {