From 88c9f8b574ead01e32c5ee5228679723343cd52c Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Tue, 15 Sep 2015 11:26:18 +0200 Subject: xlibs: replace occurrences by xorg This seems to have been confusing people, using both xlibs and xorg, etc. - Avoided renaming local (and different) xlibs binding in gcc*. - Fixed cases where both xorg and xlibs were used. Hopefully everything still works as before. --- pkgs/applications/editors/sublime3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/editors/sublime3') diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index 1764c85ca7dd..b26d27a8bc51 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -1,10 +1,10 @@ -{ fetchurl, stdenv, glib, xlibs, cairo, gtk, pango, makeWrapper, openssl, bzip2 }: +{ fetchurl, stdenv, glib, xorg, cairo, gtk, pango, makeWrapper, openssl, bzip2 }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; let build = "3083"; - libPath = stdenv.lib.makeLibraryPath [glib xlibs.libX11 gtk cairo pango]; + libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo pango]; in let # package with just the binaries sublime = stdenv.mkDerivation { -- cgit 1.4.1