public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xlibs: replace occurrences by xorg

Browse Source 
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.
This commit is contained in:
Vladimír Čunát
2015-09-15 11:26:18 +02:00
parent 21e3ff658a
commit 88c9f8b574
117 changed files with 406 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/inputmethods/touchegg/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, xlibs, xorgserver, qt4, mesa, geis }:
{ stdenv, fetchurl, xorg, xorgserver, qt4, mesa, geis }:
stdenv.mkDerivation rec {
name = "touchegg-${version}";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "95734815c7219d9a71282f3144b3526f2542b4fa270a8e69d644722d024b4038";
};
buildInputs = [ xorgserver mesa xlibs.libX11 xlibs.libXtst xlibs.libXext qt4 geis ];
buildInputs = [ xorgserver mesa xorg.libX11 xorg.libXtst xorg.libXext qt4 geis ];
configurePhase = ''
sed -e "s@/usr/@$out/@g" -i $(find . -name touchegg.pro)