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

Merge: xlibs and x11 attribute cleanup

Browse Source 
Frequently using multiple *almost* identical attributes is bad.
This commit is contained in:
Vladimír Čunát
2015-09-23 10:38:44 +02:00
parent 6b0add86b9 eb09b1fd85
commit 76ef7a93e3
192 changed files with 566 additions and 578 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)