diff options
author | Ludovic Courtès <ludo@gnu.org> | 2013-06-20 23:51:00 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2013-06-20 23:51:00 +0200 |
commit | d501fad11cfbd69245a4d5e2d632a0ab37985b55 (patch) | |
tree | 4d5a347efb3a5476937b21cb5bdb26204aaeea0c /gnu/packages/pkg-config.scm | |
parent | 4db00e42109b6f8229259859deac35499eec9004 (diff) | |
parent | f3211ef3868326e3cec5318bc799a2ff6572741b (diff) | |
download | guix-patches-d501fad11cfbd69245a4d5e2d632a0ab37985b55.tar guix-patches-d501fad11cfbd69245a4d5e2d632a0ab37985b55.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/make-bootstrap.scm
Diffstat (limited to 'gnu/packages/pkg-config.scm')
-rw-r--r-- | gnu/packages/pkg-config.scm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gnu/packages/pkg-config.scm b/gnu/packages/pkg-config.scm index 9f10440fec..eb5f748bda 100644 --- a/gnu/packages/pkg-config.scm +++ b/gnu/packages/pkg-config.scm @@ -24,7 +24,10 @@ #:use-module (guix build-system trivial) #:export (pkg-config)) -(define %pkg-config +;; This is the "primitive" pkg-config package. People should use `pkg-config' +;; (see below) rather than `%pkg-config', but we export `%pkg-config' so that +;; `fold-packages' finds it. +(define-public %pkg-config (package (name "pkg-config") (version "0.27.1") |