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

authored by Peder Bergebakken Sundt and committed by GitHub d109b34a 3b216ee0

+35 -14
+19 -5
pkgs/development/libraries/ayatana-ido/default.nix pkgs/by-name/ay/ayatana-ido/package.nix
··· 1 - { lib, stdenv, fetchFromGitHub 2 - , pkg-config, cmake 3 - , gtk3 1 + { 2 + cmake, 3 + fetchFromGitHub, 4 + glib, 5 + gtk3, 6 + lib, 7 + pkg-config, 8 + stdenv, 4 9 }: 5 10 6 11 stdenv.mkDerivation rec { ··· 14 19 sha256 = "sha256-WEPW9BstDv2k/5dTEDQza3eOQ9bd6CEVvmd817sEPAs="; 15 20 }; 16 21 17 - nativeBuildInputs = [ pkg-config cmake ]; 22 + nativeBuildInputs = [ 23 + cmake 24 + glib # for glib-mkenums 25 + pkg-config 26 + ]; 18 27 19 28 buildInputs = [ gtk3 ]; 20 29 30 + strictDeps = true; 31 + 21 32 meta = with lib; { 22 33 description = "Ayatana Display Indicator Objects"; 23 34 homepage = "https://github.com/AyatanaIndicators/ayatana-ido"; 24 35 changelog = "https://github.com/AyatanaIndicators/ayatana-ido/blob/${version}/ChangeLog"; 25 - license = [ licenses.lgpl3Plus licenses.lgpl21Plus ]; 36 + license = [ 37 + licenses.lgpl3Plus 38 + licenses.lgpl21Plus 39 + ]; 26 40 maintainers = [ maintainers.nickhu ]; 27 41 platforms = platforms.linux; 28 42 };
+16 -5
pkgs/development/libraries/libayatana-indicator/default.nix pkgs/by-name/li/libayatana-indicator/package.nix
··· 1 - { stdenv, fetchFromGitHub, lib 2 - , pkg-config, cmake 3 - , gtk3 4 - , ayatana-ido 1 + { 2 + ayatana-ido, 3 + cmake, 4 + fetchFromGitHub, 5 + glib, 6 + gtk3, 7 + lib, 8 + pkg-config, 9 + stdenv, 5 10 }: 6 11 7 12 stdenv.mkDerivation rec { ··· 15 20 sha256 = "sha256-OsguZ+jl274uPSCTFHq/ZwUE3yHR7MlUPHCpfmn1F7A="; 16 21 }; 17 22 18 - nativeBuildInputs = [ pkg-config cmake ]; 23 + nativeBuildInputs = [ 24 + cmake 25 + glib # for glib-mkenums 26 + pkg-config 27 + ]; 19 28 20 29 buildInputs = [ gtk3 ]; 21 30 22 31 propagatedBuildInputs = [ ayatana-ido ]; 32 + 33 + strictDeps = true; 23 34 24 35 meta = with lib; { 25 36 description = "Ayatana Indicators Shared Library";
-4
pkgs/top-level/all-packages.nix
··· 19359 19359 inherit (darwin.apple_sdk.frameworks) CoreAudio AudioToolbox; 19360 19360 }; 19361 19361 19362 - ayatana-ido = callPackage ../development/libraries/ayatana-ido { }; 19363 - 19364 19362 ayatana-webmail = callPackage ../applications/networking/mailreaders/ayatana-webmail { }; 19365 19363 19366 19364 azmq = callPackage ../development/libraries/azmq { }; ··· 21535 21533 libindicator-gtk2 = libindicator.override { gtkVersion = "2"; }; 21536 21534 libindicator-gtk3 = libindicator.override { gtkVersion = "3"; }; 21537 21535 libindicator = callPackage ../development/libraries/libindicator { }; 21538 - 21539 - libayatana-indicator = callPackage ../development/libraries/libayatana-indicator { }; 21540 21536 21541 21537 libinotify-kqueue = callPackage ../development/libraries/libinotify-kqueue { }; 21542 21538