ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-04 01:42:53 +03:00
Code Issues Projects Releases Wiki Activity

all-packages: drop unnecessary inherit (xorg) foo;

Browse Source 
/cc #11248.
This commit is contained in:
Vladimír Čunát 2015-11-25 13:57:01 +01:00
parent ed2b30dc28
commit 7b88e7b51f
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/top-level/all-packages.nix
View File

@ -3340,11 +3340,7 @@ let
vnc2flv = callPackage ../tools/video/vnc2flv {}; vnc2flv = callPackage ../tools/video/vnc2flv {};
vncrec = callPackage ../tools/video/vncrec { vncrec = callPackage ../tools/video/vncrec { };
inherit (xorg) imake libX11 xproto gccmakedep libXt
libXmu libXaw libXext xextproto libSM libICE libXpm
libXp;
};
vobcopy = callPackage ../tools/cd-dvd/vobcopy { }; vobcopy = callPackage ../tools/cd-dvd/vobcopy { };
@ -3990,8 +3986,6 @@ let
inherit zip unzip zlib boehmgc gettext pkgconfig perl; inherit zip unzip zlib boehmgc gettext pkgconfig perl;
inherit gtk; inherit gtk;
inherit (gnome) libart_lgpl; inherit (gnome) libart_lgpl;
inherit (xorg) libX11 libXt libSM libICE libXtst libXi libXrender
libXrandr xproto renderproto xextproto inputproto randrproto;
}); });
gnat = gnat45; # failed to make 4.6 or 4.8 build gnat = gnat45; # failed to make 4.6 or 4.8 build
@ -6352,9 +6346,7 @@ let
freeglut = callPackage ../development/libraries/freeglut { }; freeglut = callPackage ../development/libraries/freeglut { };
freenect = callPackage ../development/libraries/freenect { freenect = callPackage ../development/libraries/freenect { };
inherit (xorg) libXi libXmu;
};
freetype = callPackage ../development/libraries/freetype { }; freetype = callPackage ../development/libraries/freetype { };
@ -9740,9 +9732,7 @@ let
dietlibc = callPackage ../os-specific/linux/dietlibc { }; dietlibc = callPackage ../os-specific/linux/dietlibc { };
directvnc = callPackage ../os-specific/linux/directvnc { directvnc = callPackage ../os-specific/linux/directvnc { };
inherit (xorg) xproto;
};
dmraid = callPackage ../os-specific/linux/dmraid { dmraid = callPackage ../os-specific/linux/dmraid {
devicemapper = devicemapper.override {enable_dmeventd = true;}; devicemapper = devicemapper.override {enable_dmeventd = true;};
@ -13563,7 +13553,6 @@ let
x42-plugins = callPackage ../applications/audio/x42-plugins { }; x42-plugins = callPackage ../applications/audio/x42-plugins { };
xaos = callPackage ../applications/graphics/xaos { xaos = callPackage ../applications/graphics/xaos {
inherit (xorg) libXt libX11 libXext xextproto xproto;
libpng = libpng12; libpng = libpng12;
}; };
@ -14295,9 +14284,7 @@ let
xsnow = callPackage ../games/xsnow { }; xsnow = callPackage ../games/xsnow { };
xsokoban = callPackage ../games/xsokoban { xsokoban = callPackage ../games/xsokoban { };
inherit (xorg) libX11 xproto libXpm libXt;
};
zandronum = callPackage ../games/zandronum { }; zandronum = callPackage ../games/zandronum { };
zandronum-server = callPackage ../games/zandronum/server.nix { }; zandronum-server = callPackage ../games/zandronum/server.nix { };