gnu: Use self-references to inputs for #:disallowed-references.

This allows ‘package-input-rewriting’ to operate as expected on these
packages.  Failing that, rewritten packages would still carry references to
non-rewritten packages in #:disallowed-references.

* gnu/packages/admin.scm (wpa-supplicant-gui): Use ‘this-package-native-input’
for #:disallowed-references.
* gnu/packages/fontutils.scm (freetype): Likewise.
* gnu/packages/glib.scm (glib-minimal): Likewise.
* gnu/packages/gnome.scm (cogl, gnome-shell): Likewise.
* gnu/packages/groff.scm (groff-minimal): Likewise.
* gnu/packages/gstreamer.scm (gstreamer): Likewise.
* gnu/packages/gtk.scm (gtk+): Likewise.
* gnu/packages/inkscape.scm (inkscape/pinned): Likewise.
* gnu/packages/java.scm (icedtea-8, openjdk9, openjdk10)
(openjdk11): Likewise.
* gnu/packages/linux.scm (f2fs-tools/static): Likewise.
* gnu/packages/man.scm (man-db): Likewise.
* gnu/packages/openldap.scm (389-ds-base): Likewise.
* gnu/packages/qt.scm (qtbase-5): Likewise.
* gnu/packages/rrdtool.scm (rrdtool): Likewise.
* gnu/packages/rust.scm (rust-bootstrapped-package): Likewise.
* gnu/packages/statistics.scm (r-with-tests): Likewise.
(r-minimal): Likewise.
* gnu/packages/texinfo.scm (info-reader): Likewise.
* gnu/packages/tls.scm (gnutls): Likewise.
(openssl-1.1): Likewise.
* gnu/packages/version-control.scm (git-minimal): Likewise.
(git): Likewise.
(gource): Likewise.
* gnu/packages/web.scm (mod-wsgi): Likewise.
* gnu/packages/xfce.scm (xfdesktop): Likewise.
* gnu/packages/perl.scm (perl-libtime-parsedate): Update comment.
* gnu/packages/video.scm (v4l-utils-minimal): Add FIXME comment.

Change-Id: I118ecd5894c24c53ec52c9208b0025ccfa3dd68a
Signed-off-by: Ludovic Courtès <ludo@gnu.org>

1 files changed, 13 insertions, 7 deletions

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 4d3cdef4524..235e0b0b8a6 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -738,7 +738,9 @@ IcedTea build harness.")
          ((guix build ant-build-system)
           ,@%default-gnu-imported-modules)
 
-         #:disallowed-references ,(list (gexp-input icedtea-7 "jdk"))
+         #:disallowed-references ,(list (gexp-input
+                                         (this-package-native-input "jdk")
+                                         "jdk"))
 
          ,@(substitute-keyword-arguments (package-arguments icedtea-7)
              ((#:modules modules)
@@ -929,8 +931,9 @@ new Date();"))
         (ice-9 popen))
        #:tests? #f                      ; require jtreg
        #:make-flags '("all")
-       #:disallowed-references ,(list (gexp-input icedtea-8)
-                                      (gexp-input icedtea-8 "jdk"))
+       #:disallowed-references
+       ,(list (this-package-native-input "icedtea")
+              (gexp-input (this-package-native-input "icedtea") "jdk"))
 
        #:phases
        (modify-phases %standard-phases
@@ -1302,8 +1305,8 @@ new Date();"))
                (substitute* "make/autoconf/generated-configure.sh"
                  (("-Werror") ""))))))
        ((#:disallowed-references _ '())
-        `(,(gexp-input openjdk9)
-          ,(gexp-input openjdk9 "jdk")))))
+        `(,(this-package-native-input "openjdk9")
+          ,(gexp-input (this-package-native-input "openjdk9") "jdk")))))
     (native-inputs
      `(("openjdk9" ,openjdk9)
        ("openjdk9:jdk" ,openjdk9 "jdk")
@@ -1348,8 +1351,11 @@ new Date();"))
                   (ice-9 popen)
                   (srfi srfi-1)
                   (srfi srfi-26))
-      #:disallowed-references (list (gexp-input openjdk10)
-                                    (gexp-input openjdk10 "jdk"))
+
+      #:disallowed-references
+      (list (this-package-native-input "openjdk")
+            (gexp-input (this-package-native-input "openjdk")
+                        "jdk"))
 
       #:tests? #f                       ; requires jtreg
       ;; TODO package jtreg