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

6
pkgs/development/interpreters/python/2.6/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false
, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, self, callPackage }:
, sqlite, tcl, tk, xlibsWrapper, openssl, readline, db, ncurses, gdbm, self, callPackage }:
assert zlibSupport -> zlib != null;
@@ -49,7 +49,7 @@ let
buildInputs =
optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++
[ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline x11 tcl tk sqlite ]
[ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline xlibsWrapper tcl tk sqlite ]
++ optional zlibSupport zlib;
@@ -198,7 +198,7 @@ let
tkinter = buildInternalPythonModule {
moduleName = "tkinter";
deps = [ tcl tk x11 ];
deps = [ tcl tk xlibsWrapper ];
};
readline = buildInternalPythonModule {

8
pkgs/development/interpreters/python/2.7/default.nix
View File

@@ -5,7 +5,7 @@
, db, gdbm, ncurses, sqlite, readline
, tcl ? null, tk ? null, x11 ? null, libX11 ? null, x11Support ? !stdenv.isCygwin
, tcl ? null, tk ? null, xlibsWrapper ? null, libX11 ? null, x11Support ? !stdenv.isCygwin
, zlib ? null, zlibSupport ? true
, expat, libffi
@@ -15,7 +15,7 @@
assert zlibSupport -> zlib != null;
assert x11Support -> tcl != null
&& tk != null
&& x11 != null
&& xlibsWrapper != null
&& libX11 != null;
with stdenv.lib;
@@ -92,7 +92,7 @@ let
++ optionals stdenv.isCygwin [ expat libffi ]
++ optionals includeModules (
[ db gdbm ncurses sqlite readline
] ++ optionals x11Support [ tcl tk x11 libX11 ]
] ++ optionals x11Support [ tcl tk xlibsWrapper libX11 ]
)
++ optional zlibSupport zlib
@@ -249,7 +249,7 @@ let
tkinter = if stdenv.isCygwin then null else (buildInternalPythonModule {
moduleName = "tkinter";
deps = [ tcl tk x11 libX11 ];
deps = [ tcl tk xlibsWrapper libX11 ];
});
} // {