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

Merge pull request #261323 from nowittynamesleft/more-pkg-config-modules 

More pkg config modules
parents d62ebb37 b3ac258c

pkgs/development/interpreters/python/cpython/default.nix

+6 −2
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
, reproducibleBuild ? false

, pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}"

, noldconfigPatch ? ./. + "/${sourceVersion.major}.${sourceVersion.minor}/no-ldconfig.patch"

, testers

} @ inputs:



# Note: this package is used for bootstrapping fetchurl, and thus
@@ -232,7 +233,7 @@ let 
  '';



  execSuffix = stdenv.hostPlatform.extensions.executable;

in with passthru; stdenv.mkDerivation {

in with passthru; stdenv.mkDerivation (finalAttrs: {

  pname = "python3";

  inherit src version;
@@ -579,6 +580,8 @@ in with passthru; stdenv.mkDerivation { 


      nativeBuildInputs = with pkgsBuildBuild.python3.pkgs; [ sphinxHook python_docs_theme ];

    };



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

  };



  enableParallelBuilding = true;
@@ -604,8 +607,9 @@ in with passthru; stdenv.mkDerivation { 
      high level dynamic data types.

    '';

    license = licenses.psfl;

    pkgConfigModules = [ "python3" ];

    platforms = platforms.linux ++ platforms.darwin ++ platforms.windows;

    maintainers = with maintainers; [ fridh ];

    mainProgram = executable;

  };

}
 
})

pkgs/development/libraries/geos/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { 
  doCheck = true;



  passthru.tests = {

    pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };

    pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

    geos = callPackage ./tests.nix { geos = finalAttrs.finalPackage; };

  };

pkgs/development/libraries/gsasl/default.nix

+9 −4
Original line number Diff line number Diff line 
{ fetchurl, lib, stdenv, libidn, libkrb5 }:

{ fetchurl, lib, stdenv, libidn, libkrb5

, testers

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "gsasl";

  version = "2.2.0";



  src = fetchurl {

    url = "mirror://gnu/gsasl/${pname}-${version}.tar.gz";

    url = "mirror://gnu/gsasl/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";

    sha256 = "sha256-ebho47mXbcSE1ZspygroiXvpbOTTbTKu1dk1p6Mwd1k=";

  };
@@ -24,6 +26,8 @@ stdenv.mkDerivation rec { 
  '';

  doCheck = !stdenv.hostPlatform.isDarwin;



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



  meta = {

    description = "GNU SASL, Simple Authentication and Security Layer library";
@@ -38,6 +42,7 @@ stdenv.mkDerivation rec { 
    license = lib.licenses.gpl3Plus;



    maintainers = with lib.maintainers; [ shlevy ];

    pkgConfigModules = [ "libgsasl" ];

    platforms = lib.platforms.all;

  };

}
 
})

pkgs/development/libraries/libidn/default.nix

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

{ fetchurl, lib, stdenv, libiconv

, testers

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "libidn";

  version = "1.41";



  src = fetchurl {

    url = "mirror://gnu/libidn/${pname}-${version}.tar.gz";

    url = "mirror://gnu/libidn/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";

    sha256 = "sha256-iE1wY2S4Gr3Re+6Whtj/KudDHFoUZRBHxorfizH9iUU=";

  };
@@ -15,6 +17,8 @@ stdenv.mkDerivation rec { 


  buildInputs = lib.optional stdenv.isDarwin libiconv;



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



  meta = {

    homepage = "https://www.gnu.org/software/libidn/";

    description = "Library for internationalized domain names";
@@ -36,7 +40,8 @@ stdenv.mkDerivation rec { 
    '';



    license = lib.licenses.lgpl2Plus;

    pkgConfigModules = [ "libidn" ];

    platforms = lib.platforms.all;

    maintainers = with lib.maintainers; [ lsix ];

  };

}
 
})

pkgs/development/libraries/libpng/12.nix

+13 −6
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, zlib }:

{ lib, stdenv, fetchurl, zlib

, testers

}:



assert stdenv.hostPlatform == stdenv.buildPlatform -> zlib != null;



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "libpng";

  version = "1.2.59";



  src = fetchurl {

    url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz";

    url = "mirror://sourceforge/libpng/libpng-${finalAttrs.version}.tar.xz";

    sha256 = "1izw9ybm27llk8531w6h4jp4rk2rxy2s9vil16nwik5dp0amyqxl";

  };
@@ -15,18 +17,23 @@ stdenv.mkDerivation rec { 


  propagatedBuildInputs = [ zlib ];



  passthru = { inherit zlib; };



  configureFlags = [ "--enable-static" ];



  postInstall = ''mv "$out/bin" "$dev/bin"'';



  passthru = {

    inherit zlib;



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

  };



  meta = with lib; {

    description = "The official reference implementation for the PNG file format";

    homepage = "http://www.libpng.org/pub/png/libpng.html";

    license = licenses.libpng;

    maintainers = [ ];

    branch = "1.2";

    pkgConfigModules = [ "libpng" "libpng12" ];

    platforms = platforms.unix;

  };

}
 
})