From 2be90ccb4faa99a2a8d71e21fa7090a3bc89c263 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 9 Mar 2019 11:41:12 +0000 Subject: gnome3.gtk -> gtk3 fix evaluation when config.allowAliases == false (regression after #55735) --- pkgs/applications/video/lightworks/default.nix | 6 +++--- pkgs/applications/video/subtitleeditor/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/applications/video') 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