treewide: fix build with disallowed aliases (#43872)

fixes build with disallowed aliases

12 files changed, 20 insertions, 21 deletions

diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix
index 04ee72edc36..7f2080c6fd6 100644
--- a/pkgs/applications/audio/abcde/default.nix
+++ b/pkgs/applications/audio/abcde/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, libcdio-paranoia, cddiscid, wget, which, vorbis-tools, id3v2, eyeD3
 , lame, flac, glyr
-, perl, DigestSHA, MusicBrainz, MusicBrainzDiscID
+, perl, MusicBrainz, MusicBrainzDiscID
 , makeWrapper }:
 
 let version = "2.8.1";
@@ -35,7 +35,7 @@ in
 
     buildInputs = [ makeWrapper ];
 
-    propagatedBuildInputs = [ perl DigestSHA MusicBrainz MusicBrainzDiscID ];
+    propagatedBuildInputs = [ perl MusicBrainz MusicBrainzDiscID ];
 
     installFlags = [ "sysconfdir=$(out)/etc" ];
 
diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix
index 1c58f4f79cd..dc59ba6e01a 100644
--- a/pkgs/applications/audio/lollypop/default.nix
+++ b/pkgs/applications/audio/lollypop/default.nix
@@ -2,7 +2,7 @@
 , appstream-glib, desktop-file-utils, gobjectIntrospection
 , python36Packages, gnome3, glib, gst_all_1 }:
 
-stdenv.mkDerivation rec  {  
+stdenv.mkDerivation rec  {
   version = "0.9.521";
   name = "lollypop-${version}";
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec  {
   ];
 
   buildInputs = [ glib ] ++ (with gnome3; [
-    gsettings_desktop_schemas gtk3 libsecret libsoup totem-pl-parser
+    gsettings-desktop-schemas gtk3 libsecret libsoup totem-pl-parser
   ]) ++ (with gst_all_1; [
     gst-libav gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly
     gstreamer
diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix
index 1f41253b699..a409060afdc 100644
--- a/pkgs/applications/graphics/shutter/default.nix
+++ b/pkgs/applications/graphics/shutter/default.nix
@@ -7,9 +7,9 @@ let
     [ Gnome2 Gnome2Canvas Gtk2 Glib Pango Gnome2VFS Gnome2Wnck Gtk2ImageView
       Gtk2Unique FileWhich FileCopyRecursive XMLSimple NetDBus XMLTwig
       XMLParser HTTPMessage ProcSimple SortNaturally LocaleGettext
-      ProcProcessTable URI ImageExifTool Gtk2AppIndicator LWPUserAgent JSON
+      ProcProcessTable URI ImageExifTool Gtk2AppIndicator LWP JSON
       PerlMagick WWWMechanize HTTPDate HTMLForm HTMLParser HTMLTagset JSONXS
-      CommonSense HTTPCookies NetOAuth PathClass GooCanvas X11Protocol Cairo
+      commonsense HTTPCookies NetOAuth PathClass GooCanvas X11Protocol Cairo
       EncodeLocale TryTiny TypesSerialiser LWPMediaTypes
     ];
 in
diff --git a/pkgs/applications/misc/yarssr/default.nix b/pkgs/applications/misc/yarssr/default.nix
index 2c569b7d681..a8ff981400a 100644
--- a/pkgs/applications/misc/yarssr/default.nix
+++ b/pkgs/applications/misc/yarssr/default.nix
@@ -16,7 +16,7 @@ let
     ClassSingleton
     URI
     AnyEvent AnyEventHTTP
-    CommonSense
+    commonsense
     FileSlurp
     JSON
     Guard
diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix
index 5de6c0d882a..8d7f4e6cc70 100644
--- a/pkgs/applications/networking/browsers/eolie/default.nix
+++ b/pkgs/applications/networking/browsers/eolie/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [ gtkspell3 hunspell python36Packages.pygobject3 ] ++ (with gnome3; [
-    glib glib-networking gsettings_desktop_schemas gtk3 webkitgtk libsecret
+    glib glib-networking gsettings-desktop-schemas gtk3 webkitgtk libsecret
   ]) ++ (with gst_all_1; [
     gst-libav gst-plugins-base gst-plugins-ugly gstreamer
   ]);
diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix
index 505afd25d04..d2991c3ba1c 100644
--- a/pkgs/applications/networking/feedreaders/feedreader/default.nix
+++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix
@@ -24,8 +24,8 @@ in stdenv.mkDerivation {
   buildInputs = [
     curl glib json-glib libnotify libsecret sqlite
   ] ++ (with gnome3; [
-    gtk libgee libpeas libsoup rest webkitgtk gnome_online_accounts
-    gsettings_desktop_schemas
+    gtk libgee libpeas libsoup rest webkitgtk gnome-online-accounts
+    gsettings-desktop-schemas
   ]) ++ (with gst_all_1; [
     gstreamer gst-plugins-base gst-plugins-good
   ]);
diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index 489de974aaa..c4e73f3f2fa 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -247,7 +247,7 @@ let
         makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \
           --add-flags "-icaroot $ICAInstDir" \
           --set ICAROOT "$ICAInstDir" \
-          --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome-themes-standard}/lib/gtk-2.0" \
+          --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome-themes-extra}/lib/gtk-2.0" \
           --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
           --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
           --set LD_LIBRARY_PATH "$libPath" \
diff --git a/pkgs/applications/networking/transporter/default.nix b/pkgs/applications/networking/transporter/default.nix
index 141c40f3b84..d084461a9b2 100644
--- a/pkgs/applications/networking/transporter/default.nix
+++ b/pkgs/applications/networking/transporter/default.nix
@@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
     defaultIconTheme # If I omit this there's no icons in KDE
     glib
     granite
-    gsettings_desktop_schemas
+    gsettings-desktop-schemas
     gtk3
     libgee
     magic-wormhole
@@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
   substituteInPlace ./src/WormholeInterface.vala \
     --replace /bin/wormhole ${magic-wormhole}/bin/wormhole
   '';
-  
+
   postPatch = ''
     chmod +x ./meson/post_install.py
     patchShebangs ./meson/post_install.py
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 43258282ac0..7125343dee6 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext
-, CompressZlib, zlib, libjpeg, expat, freetype, libwpd
+, IOCompress, zlib, libjpeg, expat, freetype, libwpd
 , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon
 , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
 , icu, boost, jdk, ant, cups, xorg, libcmis
@@ -251,7 +251,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = with xorg;
     [ ant ArchiveZip autoconf automake bison boost cairo clucene_core
-      CompressZlib cppunit cups curl db dbus-glib expat file flex fontconfig
+      IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig
       freetype GConf getopt gnome_vfs gperf gtk3 gtk2
       hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg
       libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index 7a2538e4bcd..5958a5aa79e 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip
-, CompressZlib, zlib, libjpeg, expat, freetype, libwpd
+, IOCompress, zlib, libjpeg, expat, freetype, libwpd
 , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon
 , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
 , icu, boost, jdk, ant, cups, xorg, libcmis, carlito
@@ -248,7 +248,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = with xorg;
     [ ant ArchiveZip autoconf automake bison boost cairo clucene_core
-      CompressZlib cppunit cups curl db dbus-glib expat file flex fontconfig
+      IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig
       freetype GConf getopt gnome_vfs gperf gtk3 gtk2
       hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg
       libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index ba5486dc015..c82a8d8ecc5 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -10,10 +10,9 @@ let
     sendEmailSupport = false;   # requires plenty of perl libraries
     perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey];
     smtpPerlLibs = [
-      perlPackages.NetSMTP perlPackages.NetSMTPSSL
+      perlPackages.libnet perlPackages.NetSMTPSSL
       perlPackages.IOSocketSSL perlPackages.NetSSLeay
-      perlPackages.MIMEBase64 perlPackages.AuthenSASL
-      perlPackages.DigestHMAC
+      perlPackages.AuthenSASL perlPackages.DigestHMAC
     ];
   };
 
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index 74c3c71dbf7..513fe06df8f 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon
     libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango
     perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun
-    perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC
+    perlPackages.ExtUtilsPkgConfig perlPackages.InlineC
     xorgserver xvfb_run
   ];