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

Merge pull request #256172 from Ericson2314/pkg-config-progress 

More progress improving pkg-config info
parents a11826e3 4b2e84f3

pkgs/development/libraries/libjpeg-turbo/default.nix

+6 −3
Original line number Diff line number Diff line
@@ -24,11 +24,12 @@ 
, opencv

, python3

, vips

, testers

}:



assert !(enableJpeg7 && enableJpeg8);  # pick only one or none, not both



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {



  pname = "libjpeg-turbo";

  version = "2.1.5.1";
@@ -36,7 +37,7 @@ stdenv.mkDerivation rec { 
  src = fetchFromGitHub {

    owner = "libjpeg-turbo";

    repo = "libjpeg-turbo";

    rev = version;

    rev = finalAttrs.version;

    sha256 = "sha256-96SBBZp+/4WkXLvHKSPItNi5WuzdVccI/ZcbJOFjYYk=";

  };
@@ -91,13 +92,15 @@ stdenv.mkDerivation rec { 
      opencv

      vips;

    inherit (python3.pkgs) pillow imread pyturbojpeg;

    pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

  };



  meta = with lib; {

    homepage = "https://libjpeg-turbo.org/";

    description = "A faster (using SIMD) libjpeg implementation";

    license = licenses.ijg; # and some parts under other BSD-style licenses

    pkgConfigModules = [ "libjpeg" "libturbojpeg" ];

    maintainers = with maintainers; [ vcunat colemickens kamadorueda ];

    platforms = platforms.all;

  };

}
 
})

pkgs/development/libraries/libjpeg/default.nix

+10 −4
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, static ? false }:

{ lib, stdenv, fetchurl

, testers

, static ? false

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "libjpeg";

  version = "9e";



  src = fetchurl {

    url = "http://www.ijg.org/files/jpegsrc.v${version}.tar.gz";

    url = "http://www.ijg.org/files/jpegsrc.v${finalAttrs.version}.tar.gz";

    sha256 = "sha256-QHfWpqda6wGIT3CJGdJZNMkzBeSffj8225EpMg5vTz0=";

  };
@@ -13,11 +16,14 @@ stdenv.mkDerivation rec { 


  outputs = [ "bin" "dev" "out" "man" ];



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



  meta = with lib; {

    homepage = "https://www.ijg.org/";

    description = "A library that implements the JPEG image file format";

    maintainers = with maintainers; [ ];

    license = licenses.free;

    pkgConfigModules = [ "libjpeg" ];

    platforms = platforms.unix;

  };

}
 
})

pkgs/top-level/pkg-config/pkg-config-data.json

+1 −1
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ 
    },

    "netsnmp": {

      "attrPath": [

        "net_snmp"

        "net-snmp"

      ]

    },

    "nix-cmd": {