Unverified Commit 3b7b2807 authored by John Ericson's avatar John Ericson Committed by GitHub
Browse files

Merge pull request #215844 from obsidiansystems/more-meta-pkg-config-modules 

treewide: Add `meta.pkgConfigModules` to a few packages
parents 441c0e54 03c5c0a2

pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix

+15 −5
Original line number Diff line number Diff line 
{lib, stdenv, fetchpatch, fetchurl, autoreconfHook, pkg-config, atk, cairo, glib

, gnome-common, gtk2, pango

, libxml2Python, perl, intltool, gettext, gtk-mac-integration-gtk2 }:

, libxml2Python, perl, intltool, gettext, gtk-mac-integration-gtk2

, testers

}:



with lib;



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "gtksourceview";

  version = "2.10.5";



  src = fetchurl {

    url = "mirror://gnome/sources/gtksourceview/2.10/${pname}-${version}.tar.bz2";

  src = let

    inherit (finalAttrs) pname version;

  in fetchurl {

    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";

    sha256 = "c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e";

  };
@@ -40,4 +44,10 @@ stdenv.mkDerivation rec { 
  '';



  doCheck = false; # requires X11 daemon

}
 


  passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;



  meta = {

    pkgConfigModules = [ "gtksourceview-2.0" ];

  };

})

pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix

+15 −5
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libxml2, bzip2, openssl, dbus-glib

, glib, gamin, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }:

, glib, gamin, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl

, testers

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "gnome-vfs";

  version = "2.24.4";



  src = fetchurl {

    url = "mirror://gnome/sources/gnome-vfs/${lib.versions.majorMinor version}/gnome-vfs-${version}.tar.bz2";

  src = let

    inherit (finalAttrs) pname version;

  in fetchurl {

    url = "mirror://gnome/sources/gnome-vfs/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";

    sha256 = "1ajg8jb8k3snxc7rrgczlh8daxkjidmcv3zr9w809sq4p2sn9pk2";

  };
@@ -35,4 +39,10 @@ stdenv.mkDerivation rec { 
  postPatch = "find . -name Makefile.in | xargs sed 's/-DG_DISABLE_DEPRECATED//g' -i ";



  doCheck = false; # needs dbus daemon

}
 


  passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;



  meta = {

    pkgConfigModules = [ "gnome-vfs-2.0" "gnome-vfs-module-2.0" ];

  };

})

pkgs/desktops/gnome/core/libgnome-keyring/default.nix

+9 −4
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool, gobject-introspection, gnome }:

{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool, gobject-introspection, gnome

, testers

}:



let

  pname = "libgnome-keyring";

  version = "3.12.0";

in

stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  name = "${pname}-${version}";



  src = fetchurl {

    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";

    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

    sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783";

  };
@@ -17,10 +19,13 @@ stdenv.mkDerivation rec { 
  propagatedBuildInputs = [ glib gobject-introspection dbus libgcrypt ];

  nativeBuildInputs = [ pkg-config intltool ];



  passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;



  meta = {

    description = "Framework for managing passwords and other secrets";

    homepage = "https://wiki.gnome.org/Projects/GnomeKeyring";

    license = with lib.licenses; [ gpl2Plus lgpl2Plus ];

    pkgConfigModules = [ "gnome-keyring-1" ];

    inherit (glib.meta) platforms maintainers;



    longDescription = ''
@@ -29,4 +34,4 @@ stdenv.mkDerivation rec { 
      with the gnome-keyring system.

    '';

  };

}
 
})

pkgs/development/libraries/cairo/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ in { 
      "cairo-ps"

      "cairo-svg"

    ] ++ lib.optional gobjectSupport "cairo-gobject"

      ++ lib.optional pdfSupport "cairo-gobject";

      ++ lib.optional pdfSupport "cairo-pdf";

    platforms = platforms.all;

  };

})

pkgs/development/libraries/freealut/default.nix

+9 −4
Original line number Diff line number Diff line 
{ lib, stdenv, darwin, fetchurl, openal }:

{ lib, stdenv, darwin, fetchurl, openal

, testers

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "freealut";

  version = "1.1.0";



  src = fetchurl {

    url = "http://www.openal.org/openal_webstf/downloads/freealut-${version}.tar.gz";

    url = "http://www.openal.org/openal_webstf/downloads/freealut-${finalAttrs.version}.tar.gz";

    sha256 = "0kzlil6112x2429nw6mycmif8y6bxr2cwjcvp18vh6s7g63ymlb0";

  };
@@ -14,10 +16,13 @@ stdenv.mkDerivation rec { 
    darwin.apple_sdk.frameworks.OpenAL

  ;



  passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;



  meta = {

    homepage = "http://openal.org/";

    description = "Free implementation of OpenAL's ALUT standard";

    license = lib.licenses.lgpl2;

    pkgConfigModules = [ "freealut" ];

    platforms = lib.platforms.unix;

  };

}
 
})