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

x11: replace its usage by xlibsWrapper directly

Browse Source 
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
This commit is contained in:
Vladimír Čunát
2015-09-15 11:13:22 +02:00
parent 47ad941fbf
commit 21e3ff658a
83 changed files with 183 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/fox/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, x11, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft }:
{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft }:
let
version = "1.7.9";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1jb9368xsin3ppdf6979n5s7in3s9klbxqbwcp0z8misjixl7nzg";
};
buildInputs = [ libpng x11 libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ];
buildInputs = [ libpng xlibsWrapper libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ];
doCheck = true;

4
pkgs/development/libraries/fox/fox-1.6.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, x11, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor
{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor
, libXrandr, mesa, libXft, libXfixes, xinput }:
let
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "03m9wm8hpzh1i0fxx5mpvjr67384pfm9hn7gzdcq55b4639fqy9n";
};
buildInputs = [ x11 libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr
buildInputs = [ xlibsWrapper libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr
libXft mesa libXfixes xinput ];
doCheck = true;