public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkgs/desktops: pkgconfig -> pkg-config

Browse Source
This commit is contained in:
Ben Siraphob
2021-01-16 23:49:59 -08:00
committed by Jonathan Ringer
parent 82ba45d59e
commit 5fffcef915
268 changed files with 539 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, gnome_python, librsvg, libwnck, libgtop, pkgconfig, python2, gtk2 }:
{ lib, stdenv, fetchurl, gnome_python, librsvg, libwnck, libgtop, pkg-config, python2, gtk2 }:
let
inherit (python2.pkgs) python pygtk;
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
sha256 = "1s8f9rns9v7qlwjv9qh9lr8crp88dpzfm45hj47zc3ivpy0dbnq9";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk2 librsvg libwnck libgtop python ];
propagatedBuildInputs = [ gnome_python pygtk ];
pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, python2, pkgconfig, libgnome, GConf, glib, gtk2, gnome_vfs }:
{ lib, stdenv, fetchurl, python2, pkg-config, libgnome, GConf, glib, gtk2, gnome_vfs }:
with lib;
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
sha256 = "759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ python glib gtk2 GConf libgnome gnome_vfs ];
propagatedBuildInputs = [ pygobject2 pygtk dbus-python ];
pkgs/desktops/gnome-2/bindings/libglademm/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtkmm2, libglade }:
{ stdenv, fetchurl, pkg-config, intltool, gtkmm2, libglade }:
stdenv.mkDerivation rec {
name = "libglademm-2.6.7";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "devdoc" ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ intltool ];
propagatedBuildInputs = [ gtkmm2 libglade ];
pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{lib, stdenv, fetchpatch, fetchurl, autoreconfHook, pkgconfig, atk, cairo, glib
{lib, stdenv, fetchpatch, fetchurl, autoreconfHook, pkg-config, atk, cairo, glib
, gnome-common, gtk2, pango
, libxml2Python, perl, intltool, gettext, gtk-mac-integration-gtk2 }:
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
})
];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
atk cairo glib gtk2
pango libxml2Python perl intltool
pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, gnome2, dbus-glib, gmime, gnome-icon-theme, libnotify, libgnome-keyring, openssl, cyrus_sasl, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }:
{ lib, stdenv, fetchFromGitHub, pkg-config, glib, gnome2, dbus-glib, gmime, gnome-icon-theme, libnotify, libgnome-keyring, openssl, cyrus_sasl, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }:
stdenv.mkDerivation rec {
rev = "9ae8768";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1slb7gajn30vdaq0hf5rikwdly1npmg1cf83hpjs82xd98knl13d";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib dbus-glib gmime libnotify libgnome-keyring openssl cyrus_sasl sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus-glib gmime libnotify gnome2.scrollkeeper libxml2 gnome-icon-theme hicolor-icon-theme tango-icon-theme ];
prePatch = ''
pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, automake, gettext}:
{stdenv, fetchurl, pkg-config, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, automake, gettext}:
stdenv.mkDerivation {
name = "scrollkeeper-0.3.14";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
cp ${automake}/share/automake*/config.{sub,guess} .
";
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libxml2 libxslt gettext ]
++ (with perlPackages; [ perl XMLParser ]);
configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/catalog.xml" ];
pkgs/desktops/gnome-2/desktop/vte/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, intltool, pkgconfig, glib, gtk2, ncurses
{ lib, stdenv, fetchurl, fetchpatch, intltool, pkg-config, glib, gtk2, ncurses
, pythonSupport ? false, python27Packages}:
let
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
})
];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ intltool glib gtk2 ncurses ] ++
lib.optionals pythonSupport [python pygtk];
pkgs/desktops/gnome-2/platform/GConf/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2, polkit, python3, intltool }:
{ lib, stdenv, fetchurl, pkg-config, dbus-glib, glib, ORBit2, libxml2, polkit, python3, intltool }:
stdenv.mkDerivation rec {
pname = "gconf";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ glib dbus-glib ];
nativeBuildInputs = [ pkgconfig intltool ];
nativeBuildInputs = [ pkg-config intltool ];
configureFlags =
# fixes the "libgconfbackend-oldxml.so is not portable" error on darwin
pkgs/desktops/gnome-2/platform/ORBit2/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, glib, libIDL, libintl }:
{ lib, stdenv, fetchurl, pkg-config, glib, libIDL, libintl }:
stdenv.mkDerivation rec {
name = "ORBit2-${minVer}.19";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam";
};
nativeBuildInputs = [ pkgconfig libintl ];
nativeBuildInputs = [ pkg-config libintl ];
propagatedBuildInputs = [ glib libIDL ];
outputs = [ "out" "dev" ];
pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, libxml2, bzip2, openssl, dbus-glib
{ stdenv, fetchurl, fetchpatch, pkg-config, libxml2, bzip2, openssl, dbus-glib
, glib, gamin, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ intltool pkgconfig ];
nativeBuildInputs = [ intltool pkg-config ];
buildInputs =
[ libxml2 bzip2 openssl dbus-glib gamin cdparanoia
gnome_mime_data avahi acl
pkgs/desktops/gnome-2/platform/gtkglext/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ lib, stdenv
, fetchFromGitLab
, pkgconfig
, pkg-config
, gtk-doc
, autoconf
, automake
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
pkgconfig
pkg-config
gtk-doc
autoconf
automake
pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk3, intltool
{ stdenv, fetchurl, pkg-config, gtk3, intltool
, GConf, enchant, isocodes, gnome-icon-theme, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
@@ -11,6 +11,6 @@ stdenv.mkDerivation rec {
};
propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome-icon-theme GConf ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ intltool enchant isocodes ];
}
pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk2, intltool,
{ stdenv, fetchurl, pkg-config, gtk2, intltool,
GConf, enchant, isocodes, gnome-icon-theme }:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
#http://www.mail-archive.com/debian-bugs-rc@lists.debian.org/msg250091.html
patches = [ ./01_remove-disable-deprecated.patch ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk2 intltool GConf enchant isocodes gnome-icon-theme ];
NIX_LDFLAGS = "-lgthread-2.0";
pkgs/desktops/gnome-2/platform/libIDL/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, flex, bison, pkgconfig, glib, gettext}:
{stdenv, fetchurl, flex, bison, pkg-config, glib, gettext}:
stdenv.mkDerivation rec {
name = "libIDL-${minVer}.14";
@@ -11,5 +11,5 @@ stdenv.mkDerivation rec {
buildInputs = [ glib gettext ];
nativeBuildInputs = [ flex bison pkgconfig ];
nativeBuildInputs = [ flex bison pkg-config ];
}
pkgs/desktops/gnome-2/platform/libbonobo/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, flex, bison, pkgconfig, glib, libxml2, popt
{ stdenv, fetchurl, flex, bison, pkg-config, glib, libxml2, popt
, intltool, ORBit2, procps }:
stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
preConfigure = # still using stuff deprecated in new glib versions
"sed 's/-DG_DISABLE_DEPRECATED//g' -i configure activation-server/Makefile.in";
nativeBuildInputs = [ flex bison pkgconfig intltool procps ];
nativeBuildInputs = [ flex bison pkg-config intltool procps ];
buildInputs = [ libxml2 ];
propagatedBuildInputs = [ popt glib ORBit2 ];
}
pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, bison, pkgconfig, popt, libxml2, gtk2, libtool
{ stdenv, fetchurl, bison, pkg-config, popt, libxml2, gtk2, libtool
, intltool, libbonobo, GConf, libgnomecanvas, libgnome, libglade }:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig intltool ];
nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [ bison popt gtk2 libxml2 GConf libglade libtool ];
propagatedBuildInputs = [ libbonobo libgnomecanvas libgnome ];
}
pkgs/desktops/gnome-2/platform/libglade/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, gtk2, libxml2, python2 ? null, withLibgladeConvert ? false, gettext }:
{ lib, stdenv, fetchurl, pkg-config, gtk2, libxml2, python2 ? null, withLibgladeConvert ? false, gettext }:
assert withLibgladeConvert -> python2 != null;
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk2 gettext ]
++ lib.optional withLibgladeConvert python2;
pkgs/desktops/gnome-2/platform/libgnome/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, popt, zlib, libcanberra-gtk2
{ stdenv, fetchurl, pkg-config, glib, popt, zlib, libcanberra-gtk2
, intltool, libbonobo, GConf, gnome_vfs, libtool, libogg
}:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra-gtk2 libtool ];
propagatedBuildInputs = [ glib libbonobo libogg ];
}
pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk2, intltool, libart_lgpl, libglade }:
{ stdenv, fetchurl, pkg-config, gtk2, intltool, libart_lgpl, libglade }:
stdenv.mkDerivation rec {
name = "libgnomecanvas-${minVer}.3";
@@ -12,6 +12,6 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
buildInputs = [ libglade ];
nativeBuildInputs = [ pkgconfig intltool ];
nativeBuildInputs = [ pkg-config intltool ];
propagatedBuildInputs = [ libart_lgpl gtk2 ];
}
pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libgnomecanvas, gtkmm2 }:
{ stdenv, fetchurl, pkg-config, libgnomecanvas, gtkmm2 }:
stdenv.mkDerivation {
name = "libgnomecanvasmm-2.26.0";
@@ -8,6 +8,6 @@ stdenv.mkDerivation {
sha256 = "996577f97f459a574919e15ba7fee6af8cda38a87a98289e9a4f54752d83e918";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libgnomecanvas gtkmm2 ];
}
pkgs/desktops/gnome-2/platform/libgnomecups/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk2, gettext, libxml2, intltool, libart_lgpl }:
{ stdenv, fetchurl, pkg-config, gtk2, gettext, libxml2, intltool, libart_lgpl }:
stdenv.mkDerivation rec {
name = "libgnomecups-0.2.3";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
patches = [ ./glib.patch ./cups_1.6.patch ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk2 gettext intltool libart_lgpl ];
propagatedBuildInputs = [ libxml2 ];
pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, gettext, libxml2, intltool, libart_lgpl
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, gtk2, gettext, libxml2, intltool, libart_lgpl
, libgnomecups, bison, flex }:
stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
})
];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk2 gettext intltool libart_lgpl libgnomecups bison flex ];
propagatedBuildInputs = [ libxml2 ];
pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, gtk2, gettext, intltool, libgnomecanvas, libgnomeprint, gnome-icon-theme}:
{stdenv, fetchurl, pkg-config, gtk2, gettext, intltool, libgnomecanvas, libgnomeprint, gnome-icon-theme}:
stdenv.mkDerivation {
name = "libgnomeprintui-2.18.6";
@@ -8,6 +8,6 @@ stdenv.mkDerivation {
sha256 = "0spl8vinb5n6n1krnfnr61dwaxidg67h8j94z9p59k2xdsvfashm";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk2 gettext intltool libgnomecanvas libgnomeprint gnome-icon-theme];
}
pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, libxml2, xorg, glib, pango
{ stdenv, fetchurl, fetchpatch, pkg-config, libxml2, xorg, glib, pango
, intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool
, gnome_vfs, libgnome-keyring, libglade }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
})
];
nativeBuildInputs = [ pkgconfig intltool ];
nativeBuildInputs = [ pkg-config intltool ];
buildInputs =
[ xorg.xlibsWrapper libxml2 GConf pango glib libgnome-keyring libglade libtool ];
pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, gtk2, gettext, libxml2 }:
{stdenv, fetchurl, pkg-config, gtk2, gettext, libxml2 }:
stdenv.mkDerivation {
name = "libgtkhtml-2.11.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "0msajafd42545dxzyr5zqka990cjrxw2yz09ajv4zs8m1w6pm9rw";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk2 gettext ];
propagatedBuildInputs = [ libxml2 ];