Unverified Commit d109b34a authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

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

parents 3b216ee0 8e2f23d6

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

+19 −5
Original line number Diff line number Diff line 
{ 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;

  };

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

+16 −5
Original line number Diff line number Diff line 
{ 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";

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -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 {