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/development/libraries/kde-frameworks-5.10/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries/kde-frameworks-5.10/default.nix') diff --git a/pkgs/development/libraries/kde-frameworks-5.10/default.nix b/pkgs/development/libraries/kde-frameworks-5.10/default.nix index d5bb3f78ce85..8196aeab6c2b 100644 --- a/pkgs/development/libraries/kde-frameworks-5.10/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.10/default.nix @@ -116,7 +116,7 @@ let { inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme libgcrypt libgit2 modemmanager networkmanager perl - perlPackages qimageblitz xlibs zlib; + perlPackages qimageblitz xorg zlib; boost = boost156; gif = giflib; glib2 = glib; @@ -147,7 +147,7 @@ let }); frameworkintegration = extendDerivation super.frameworkintegration { - buildInputs = [ scope.xlibs.libXcursor ]; + buildInputs = [ scope.xorg.libXcursor ]; }; kauth = extendDerivation super.kauth { @@ -164,7 +164,7 @@ let }; kdelibs4support = extendDerivation super.kdelibs4support { - buildInputs = [ scope.networkmanager scope.xlibs.libSM ]; + buildInputs = [ scope.networkmanager scope.xorg.libSM ]; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook" "-DDocBookXML4_DTD_VERSION=4.5" -- cgit 1.4.1