From 2be90ccb4faa99a2a8d71e21fa7090a3bc89c263 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 9 Mar 2019 11:41:12 +0000
Subject: gnome3.gtk -> gtk3

fix evaluation when config.allowAliases == false

(regression after #55735)
---
 pkgs/applications/audio/reaper/default.nix         | 4 ++--
 pkgs/applications/misc/gxmessage/default.nix       | 4 ++--
 pkgs/applications/search/catfish/default.nix       | 4 ++--
 pkgs/applications/video/lightworks/default.nix     | 6 +++---
 pkgs/applications/video/subtitleeditor/default.nix | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix
index cabebb6f18e9..8e2b096672c1 100644
--- a/pkgs/applications/audio/reaper/default.nix
+++ b/pkgs/applications/audio/reaper/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, autoPatchelfHook, makeWrapper
 , alsaLib, xorg
-, gnome3, pango, gdk_pixbuf, cairo, glib, freetype
+, gnome3, gtk3, pango, gdk_pixbuf, cairo, glib, freetype
 , libpulseaudio, xdg_utils
 }:
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   ];
 
   runtimeDependencies = [
-    gnome3.gtk
+    gtk3
   ];
 
   dontBuild = true;
diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix
index 8401386ead49..a9e6d905c284 100644
--- a/pkgs/applications/misc/gxmessage/default.nix
+++ b/pkgs/applications/misc/gxmessage/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gnome3, intltool, pkgconfig, texinfo, hicolor-icon-theme }:
+{ stdenv, fetchurl, gtk3, intltool, pkgconfig, texinfo, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
   name = "gxmessage-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool gnome3.gtk texinfo hicolor-icon-theme ];
+  buildInputs = [ intltool gtk3 texinfo hicolor-icon-theme ];
 
   meta = {
     description = "A GTK enabled dropin replacement for xmessage";
diff --git a/pkgs/applications/search/catfish/default.nix b/pkgs/applications/search/catfish/default.nix
index c2afda2d53d9..a0917d03ce11 100644
--- a/pkgs/applications/search/catfish/default.nix
+++ b/pkgs/applications/search/catfish/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, file, which, intltool, gobject-introspection,
-  findutils, xdg_utils, gnome3, pythonPackages, hicolor-icon-theme,
+  findutils, xdg_utils, gnome3, gtk3, pythonPackages, hicolor-icon-theme,
   wrapGAppsHook
 }:
 
@@ -24,7 +24,7 @@ pythonPackages.buildPythonApplication rec {
   ];
 
   buildInputs = [
-    gnome3.gtk
+    gtk3
     gnome3.dconf
     pythonPackages.pyxdg
     pythonPackages.ptyprocess
diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix
index 4bfd9e790070..2b21a25434d5 100644
--- a/pkgs/applications/video/lightworks/default.nix
+++ b/pkgs/applications/video/lightworks/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv
-, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU
+, gnome3, gtk3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU
 , nvidia_cg_toolkit, zlib, openssl, portaudio
 }:
 let
   fullPath = stdenv.lib.makeLibraryPath [
     stdenv.cc.cc
-    gnome3.gtk
+    gtk3
     gdk_pixbuf
     cairo
     libjpeg_original
@@ -21,7 +21,7 @@ let
   lightworks = stdenv.mkDerivation rec {
     version = "14.0.0";
     name = "lightworks-${version}";
-    
+
     src =
       if stdenv.hostPlatform.system == "x86_64-linux" then
         fetchurl {
diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix
index 3683973824a3..480552b001dc 100644
--- a/pkgs/applications/video/subtitleeditor/default.nix
+++ b/pkgs/applications/video/subtitleeditor/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, intltool, file,
-  desktop-file-utils, enchant, gnome3, gst_all_1, hicolor-icon-theme,
+  desktop-file-utils, enchant, gnome3, gtk3, gst_all_1, hicolor-icon-theme,
   libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook
 }:
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   buildInputs =  [
     desktop-file-utils
     enchant
-    gnome3.gtk
+    gtk3
     gnome3.gtkmm
     gst_all_1.gstreamer
     gst_all_1.gstreamermm
-- 
cgit 1.4.1