diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2021-01-18 22:50:56 -0800 |
---|---|---|
committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-01-19 01:16:25 -0800 |
commit | 9bb3fccb5b55326cb3c2c507464a8a28d44d1730 (patch) | |
tree | 9d1c0c16cce5e5dcc08115230f6412865487964b /pkgs/development/ocaml-modules/lablgtk | |
parent | 200bb8c977d81ebdf847d5e6839cd46cd3eb8d4d (diff) | |
download | nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.gz nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.bz2 nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.lz nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.xz nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.zst nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.zip |
treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595 pkgconfig was aliased in 2018, however, it remained in all-packages.nix due to its wide usage. This cleans up the remaining references to pkgs.pkgsconfig and moves the entry to aliases.nix. python3Packages.pkgconfig remained unchanged because it's the canonical name of the upstream package on pypi.
Diffstat (limited to 'pkgs/development/ocaml-modules/lablgtk')
-rw-r--r-- | pkgs/development/ocaml-modules/lablgtk/2.14.0.nix | 4 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/lablgtk/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index 02fd7004a56..232621ad83b 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }: +{ stdenv, lib, fetchurl, ocaml, findlib, pkg-config, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }: if lib.versionAtLeast ocaml.version "4.04" then throw "lablgtk-2.14 is not available for OCaml ${ocaml.version}" else @@ -16,7 +16,7 @@ stdenv.mkDerivation (rec { sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview camlp4 ]; configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ]; diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 2aa031f419c..09487ac9dad 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview }: +{ lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkg-config, gtk2, libgnomecanvas, libglade, gtksourceview }: let param = let check = lib.versionAtLeast ocaml.version; in @@ -23,7 +23,7 @@ stdenv.mkDerivation { pname = "lablgtk"; inherit (param) version src; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview ]; configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ]; |