pkgs/applications: pkgconfig -> pkg-config
This commit is contained in:
committed by
Jonathan Ringer
parent
47e997598c
commit
5d566c43b4
@@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, fetchpatch, fetchurl, fetchFromGitHub, autoconf, automake, libtool, makeWrapper, linuxHeaders
|
||||
, pkgconfig, cmake, gnumake, yasm, python2Packages
|
||||
, pkg-config, cmake, gnumake, yasm, python2Packages
|
||||
, libgcrypt, libgpgerror, libunistring
|
||||
, boost, avahi, lame, autoreconfHook
|
||||
, gettext, pcre-cpp, yajl, fribidi, which
|
||||
@@ -99,11 +99,11 @@ let
|
||||
"-DCROSSCOMPILING=ON"
|
||||
"-DCPU=${stdenv.hostPlatform.parsed.cpu.name}"
|
||||
"-DOS=${stdenv.hostPlatform.parsed.kernel.name}"
|
||||
"-DPKG_CONFIG_EXECUTABLE=pkgconfig"
|
||||
"-DPKG_CONFIG_EXECUTABLE=pkg-config"
|
||||
];
|
||||
buildInputs = [ libidn libtasn1 p11-kit zlib libva ]
|
||||
++ lib.optional vdpauSupport libvdpau;
|
||||
nativeBuildInputs = [ cmake nasm pkgconfig gnutls ];
|
||||
nativeBuildInputs = [ cmake nasm pkg-config gnutls ];
|
||||
};
|
||||
|
||||
# We can build these externally but FindLibDvd.cmake forces us to build it
|
||||
@@ -114,7 +114,7 @@ let
|
||||
rev = "${version}-${rel}-Beta-5";
|
||||
sha256 = "0j41ydzx0imaix069s3z07xqw9q95k7llh06fc27dcn6f7b8ydyl";
|
||||
buildInputs = [ linuxHeaders ];
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
postPatch = ''
|
||||
rm -rf msvc
|
||||
|
||||
@@ -133,7 +133,7 @@ let
|
||||
rev = "${version}-${rel}-Alpha-3";
|
||||
sha256 = "0qwlf4lgahxqxk1r2pzl866mi03pbp7l1fc0rk522sc0ak2s9jhb";
|
||||
buildInputs = [ libdvdcss libdvdread ];
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
postPatch = cmakeProtoPatch;
|
||||
postInstall = ''
|
||||
mv $out/lib/liblibdvdnav.so $out/lib/libdvdnav.so
|
||||
@@ -146,7 +146,7 @@ let
|
||||
rev = "${version}-${rel}-Alpha-3";
|
||||
sha256 = "1xxn01mhkdnp10cqdr357wx77vyzfb5glqpqyg8m0skyi75aii59";
|
||||
buildInputs = [ libdvdcss ];
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
configureFlags = [ "--with-libdvdcss" ];
|
||||
postPatch = cmakeProtoPatch;
|
||||
};
|
||||
@@ -208,7 +208,7 @@ in stdenv.mkDerivation {
|
||||
doxygen
|
||||
makeWrapper
|
||||
which
|
||||
pkgconfig gnumake
|
||||
pkg-config gnumake
|
||||
autoconf automake libtool # still needed for some components. Check if that is the case with 19.0
|
||||
jre_headless yasm gettext python2Packages.python flatbuffers
|
||||
|
||||
|
||||
Reference in New Issue
Block a user