mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-03-08 01:24:09 +01:00
various: remove last remaining references to pkgs.xorg
This commit is contained in:
parent
ced5637826
commit
73d9a1c6ec
3 changed files with 1 additions and 7 deletions
|
|
@ -305,10 +305,6 @@ For example, the `libxml2` package builds both a library and some tools; but it
|
|||
|
||||
- `servers/http` (e.g. `apache-httpd`)
|
||||
|
||||
- **If it’s an implementation of the X Windowing System:**
|
||||
|
||||
- `servers/x11` (e.g. `xorg` — this includes the client libraries and programs)
|
||||
|
||||
- **Else:**
|
||||
|
||||
- `servers/misc`
|
||||
|
|
|
|||
|
|
@ -13,8 +13,6 @@
|
|||
libice,
|
||||
}:
|
||||
|
||||
# !!! assert freetype == xorg.freetype
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zoom";
|
||||
version = "1.1.5";
|
||||
|
|
|
|||
|
|
@ -161,7 +161,7 @@ let
|
|||
inherit (scope) ghc buildHaskellPackages;
|
||||
};
|
||||
in
|
||||
ps // ps.xorg // ps.gnome2 // { inherit stdenv; } // scopeSpliced;
|
||||
ps // ps.gnome2 // { inherit stdenv; } // scopeSpliced;
|
||||
defaultScope = mkScope self;
|
||||
callPackage = drv: args: callPackageWithScope defaultScope drv args;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue