lol

all-packages.nix: remove `inherit (*xorg) *`'s

using inherits in callPackage args is discouraged and doesn't splice
correctly

Artturin 61c3058b 96fa2023

+158 -243
+2 -2
pkgs/applications/accessibility/mousetweaks/default.nix
··· 1 1 { lib, stdenv, fetchurl, pkg-config 2 2 , glib, gtk3, gnome, gsettings-desktop-schemas, wrapGAppsHook 3 - , libX11, libXtst, libXfixes, libXcursor 3 + , xorg 4 4 }: 5 5 6 6 stdenv.mkDerivation rec { ··· 16 16 17 17 buildInputs = [ 18 18 glib gtk3 gsettings-desktop-schemas 19 - libX11 libXtst libXfixes libXcursor 19 + xorg.libX11 xorg.libXtst xorg.libXfixes xorg.libXcursor 20 20 ]; 21 21 22 22 passthru = {
+5 -5
pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, pkg-config, linkFarm, lightdm-enso-os-greeter 2 - , dbus, pcre, libepoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs 3 - , gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }: 2 + , dbus, pcre, libepoxy, xorg, at-spi2-core, libxklavier, libxkbcommon 3 + , gtk3, vala, cmake, libgee, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }: 4 4 5 5 stdenv.mkDerivation { 6 6 pname = "lightdm-enso-os-greeter"; ··· 30 30 pcre 31 31 libepoxy 32 32 libgee 33 - libX11 33 + xorg.libX11 34 34 lightdm 35 - libXdmcp 35 + xorg.libXdmcp 36 36 gdk-pixbuf 37 37 clutter-gtk 38 38 libxklavier 39 39 at-spi2-core 40 40 libxkbcommon 41 - libpthreadstubs 41 + xorg.libpthreadstubs 42 42 librsvg 43 43 ]; 44 44
+3 -3
pkgs/applications/emulators/maiko/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, cmake, libX11 }: 1 + { lib, stdenv, fetchFromGitHub, cmake, xorg }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "maiko"; ··· 10 10 hash = "sha256-Y+ngep/xHw6RCU8XVRYSWH6S+9hJ74z50pGpIqS2CjM="; 11 11 }; 12 12 nativeBuildInputs = [ cmake ]; 13 - buildInputs = [ libX11 ]; 13 + buildInputs = [ xorg.libX11 ]; 14 14 installPhase = '' 15 15 runHook preInstall 16 16 find . -maxdepth 1 -executable -type f -exec install -Dt $out/bin '{}' \; ··· 21 21 homepage = "https://interlisp.org/"; 22 22 license = licenses.mit; 23 23 maintainers = with maintainers; [ ehmry ]; 24 - inherit (libX11.meta) platforms; 24 + inherit (xorg.libX11.meta) platforms; 25 25 }; 26 26 }
+6 -10
pkgs/applications/graphics/epick/default.nix
··· 4 4 , stdenv 5 5 , python3 6 6 , libGL 7 - , libX11 8 - , libXcursor 9 - , libXi 10 - , libXrandr 11 - , libxcb 7 + , xorg 12 8 , libxkbcommon 13 9 , AppKit 14 10 , IOKit ··· 31 27 32 28 buildInputs = lib.optionals stdenv.isLinux [ 33 29 libGL 34 - libX11 35 - libXcursor 36 - libXi 37 - libXrandr 38 - libxcb 30 + xorg.libX11 31 + xorg.libXcursor 32 + xorg.libXi 33 + xorg.libXrandr 34 + xorg.libxcb 39 35 libxkbcommon 40 36 ] ++ lib.optionals stdenv.isDarwin [ 41 37 AppKit
+2 -3
pkgs/applications/graphics/menyoki/default.nix
··· 6 6 , stdenv 7 7 , withSixel ? false 8 8 , libsixel 9 - , libX11 10 - , libXrandr 9 + , xorg 11 10 , AppKit 12 11 , withSki ? true 13 12 }: ··· 29 28 ++ lib.optional stdenv.isLinux pkg-config; 30 29 31 30 buildInputs = lib.optional withSixel libsixel 32 - ++ lib.optionals stdenv.isLinux [ libX11 libXrandr ] 31 + ++ lib.optionals stdenv.isLinux (with xorg; [ libX11 libXrandr ]) 33 32 ++ lib.optional stdenv.isDarwin AppKit; 34 33 35 34 buildNoDefaultFeatures = !withSki;
+6 -10
pkgs/applications/misc/inlyne/default.nix
··· 4 4 , stdenv 5 5 , pkg-config 6 6 , fontconfig 7 - , libXcursor 8 - , libXi 9 - , libXrandr 10 - , libxcb 7 + , xorg 11 8 , libGL 12 - , libX11 13 9 , openssl 14 10 , AppKit 15 11 , ApplicationServices ··· 42 38 43 39 buildInputs = lib.optionals stdenv.isLinux [ 44 40 fontconfig 45 - libXcursor 46 - libXi 47 - libXrandr 48 - libxcb 41 + xorg.libXcursor 42 + xorg.libXi 43 + xorg.libXrandr 44 + xorg.libxcb 49 45 openssl 50 46 ] ++ lib.optionals stdenv.isDarwin [ 51 47 AppKit ··· 64 60 65 61 postFixup = lib.optionalString stdenv.isLinux '' 66 62 patchelf $out/bin/inlyne \ 67 - --add-rpath ${lib.makeLibraryPath [ libGL libX11 ]} 63 + --add-rpath ${lib.makeLibraryPath [ libGL xorg.libX11 ]} 68 64 ''; 69 65 70 66 meta = with lib; {
+2 -4
pkgs/applications/misc/rlaunch/default.nix
··· 1 1 { lib 2 2 , fetchFromGitHub 3 3 , rustPlatform 4 - , libX11 5 - , libXft 6 - , libXinerama 4 + , xorg 7 5 }: 8 6 9 7 rustPlatform.buildRustPackage rec { ··· 21 19 22 20 # The x11_dl crate dlopen()s these libraries, so we have to inject them into rpath. 23 21 postFixup = '' 24 - patchelf --set-rpath ${lib.makeLibraryPath [ libX11 libXft libXinerama ]} $out/bin/rlaunch 22 + patchelf --set-rpath ${lib.makeLibraryPath (with xorg; [ libX11 libXft libXinerama ])} $out/bin/rlaunch 25 23 ''; 26 24 27 25 meta = with lib; {
+2 -2
pkgs/applications/misc/trenchbroom/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub 2 2 , cmake, ninja, git, pandoc, pkg-config 3 - , libGL, libGLU, libXxf86vm, freeimage 3 + , libGL, libGLU, freeimage 4 4 , catch2, fmt, glew, miniz, tinyxml-2, xorg 5 5 , qtbase, wrapQtAppsHook 6 6 , copyDesktopItems, makeDesktopItem ··· 26 26 27 27 nativeBuildInputs = [ cmake git pandoc wrapQtAppsHook copyDesktopItems pkg-config ]; 28 28 buildInputs = [ 29 - libGL libGLU libXxf86vm freeimage qtbase catch2 fmt glew miniz tinyxml-2 29 + libGL libGLU xorg.libXxf86vm freeimage qtbase catch2 fmt glew miniz tinyxml-2 30 30 xorg.libSM 31 31 ]; 32 32 QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}";
+2 -2
pkgs/applications/misc/xastir/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config 2 2 , curl, db, libgeotiff 3 - , libXpm, libXt, motif, pcre 3 + , xorg, motif, pcre 4 4 , perl, proj, rastermagick, shapelib 5 5 }: 6 6 ··· 22 22 23 23 buildInputs = [ 24 24 curl db libgeotiff 25 - libXpm libXt motif pcre 25 + xorg.libXpm xorg.libXt motif pcre 26 26 perl proj rastermagick shapelib 27 27 ]; 28 28
+2 -2
pkgs/applications/misc/xfontsel/default.nix
··· 2 2 # at https://www.x.org/releases/individual/. 3 3 # That is why this expression is not inside pkgs.xorg 4 4 5 - { lib, stdenv, fetchurl, makeWrapper, libX11, pkg-config, libXaw }: 5 + { lib, stdenv, fetchurl, makeWrapper, xorg, pkg-config }: 6 6 7 7 stdenv.mkDerivation rec { 8 8 pname = "xfontsel"; ··· 15 15 16 16 nativeBuildInputs = [ pkg-config makeWrapper ]; 17 17 18 - buildInputs = [ libX11 libXaw ]; 18 + buildInputs = [ xorg.libX11 xorg.libXaw ]; 19 19 20 20 # Without this, it gets Xmu as a dependency, but without rpath entry 21 21 NIX_LDFLAGS = "-lXmu";
+2 -2
pkgs/applications/networking/mailreaders/claws-mail/default.nix
··· 11 11 , enableSpellcheck ? true 12 12 13 13 # Arguments to include external libraries 14 - , enableLibSM ? true, libSM 14 + , enableLibSM ? true, xorg 15 15 , enableGnuTLS ? true, gnutls 16 16 , enableEnchant ? enableSpellcheck, enchant 17 17 , enableDbus ? true, dbus, dbus-glib ··· 76 76 { flags = [ "ldap" ]; enabled = enableLdap; deps = [ openldap ]; } 77 77 { flags = [ "libetpan" ]; enabled = enableLibetpan; deps = [ libetpan ]; } 78 78 { flags = [ "libravatar-plugin" ]; enabled = enablePluginLibravatar; } 79 - { flags = [ "libsm" ]; enabled = enableLibSM; deps = [ libSM ]; } 79 + { flags = [ "libsm" ]; enabled = enableLibSM; deps = [ xorg.libSM ]; } 80 80 { flags = [ "litehtml_viewer-plugin" ]; enabled = enablePluginLitehtmlViewer; deps = [ gumbo ]; } 81 81 { flags = [ "mailmbox-plugin" ]; enabled = enablePluginMailmbox; } 82 82 { flags = [ "managesieve-plugin" ]; enabled = enablePluginManageSieve; }
+7 -12
pkgs/applications/terminal-emulators/alacritty/default.nix
··· 16 16 , fontconfig 17 17 , freetype 18 18 , libGL 19 - , libX11 20 - , libXcursor 21 - , libXi 22 - , libXrandr 23 - , libXxf86vm 24 - , libxcb 19 + , xorg 25 20 , libxkbcommon 26 21 , wayland 27 22 , xdg-utils ··· 41 36 fontconfig 42 37 freetype 43 38 libGL 44 - libX11 45 - libXcursor 46 - libXi 47 - libXrandr 48 - libXxf86vm 49 - libxcb 39 + xorg.libX11 40 + xorg.libXcursor 41 + xorg.libXi 42 + xorg.libXrandr 43 + xorg.libXxf86vm 44 + xorg.libxcb 50 45 ] ++ lib.optionals stdenv.isLinux [ 51 46 libxkbcommon 52 47 wayland
+2 -2
pkgs/data/fonts/cherry/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, fonttosfnt, mkfontdir }: 1 + { lib, stdenv, fetchFromGitHub, xorg }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "cherry"; ··· 11 11 sha256 = "13zkxwp6r6kcxv4x459vwscr0n0sik4a3kcz5xnmlpvcdnbxi586"; 12 12 }; 13 13 14 - nativeBuildInputs = [ fonttosfnt mkfontdir ]; 14 + nativeBuildInputs = [ xorg.fonttosfnt xorg.mkfontdir ]; 15 15 16 16 buildPhase = '' 17 17 patchShebangs make.sh
+2 -2
pkgs/data/fonts/clearlyU/default.nix
··· 1 - { lib, stdenv, fetchurl, fonttosfnt, mkfontscale, libfaketime }: 1 + { lib, stdenv, fetchurl, xorg, libfaketime }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "clearlyU"; ··· 9 9 sha256 = "1xn14jbv3m1khy7ydvad9ydkn7yygdbhjy9wm1v000jzjwr3lv21"; 10 10 }; 11 11 12 - nativeBuildInputs = [ fonttosfnt mkfontscale libfaketime ]; 12 + nativeBuildInputs = [ xorg.fonttosfnt xorg.mkfontscale libfaketime ]; 13 13 14 14 buildPhase = '' 15 15 # convert bdf fonts to otb
+2 -2
pkgs/data/fonts/creep/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, libfaketime 2 - , fonttosfnt, mkfontscale 2 + , xorg 3 3 }: 4 4 5 5 stdenv.mkDerivation rec { ··· 13 13 sha256 = "0zs21kznh1q883jfdgz74bb63i4lxlv98hj3ipp0wvsi6zw0vs8n"; 14 14 }; 15 15 16 - nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; 16 + nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ]; 17 17 18 18 buildPhase = '' 19 19 faketime -f "1970-01-01 00:00:01" fonttosfnt -g 2 -m 2 -o creep.otb creep.bdf
+2 -2
pkgs/data/fonts/dina/default.nix
··· 1 1 { lib, stdenv, fetchurl, unzip 2 - , bdftopcf, mkfontscale, fonttosfnt 2 + , bdftopcf, xorg 3 3 }: 4 4 5 5 stdenv.mkDerivation { ··· 14 14 }; 15 15 16 16 nativeBuildInputs = 17 - [ unzip bdftopcf mkfontscale fonttosfnt ]; 17 + [ unzip bdftopcf xorg.mkfontscale xorg.fonttosfnt ]; 18 18 19 19 postPatch = '' 20 20 sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf
+2 -2
pkgs/data/fonts/envypn-font/default.nix
··· 1 1 { lib, stdenv, fetchurl, libfaketime 2 - , fonttosfnt, mkfontscale 2 + , xorg 3 3 }: 4 4 5 5 stdenv.mkDerivation { ··· 10 10 sha256 = "bda67b6bc6d5d871a4d46565d4126729dfb8a0de9611dae6c68132a7b7db1270"; 11 11 }; 12 12 13 - nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; 13 + nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ]; 14 14 15 15 unpackPhase = '' 16 16 tar -xzf $src --strip-components=1
+4 -4
pkgs/data/fonts/gohufont/default.nix
··· 1 1 { lib, stdenv, fetchurl, fetchFromGitHub 2 - , mkfontscale, bdf2psf, bdftopcf 3 - , fonttosfnt, libfaketime 2 + , xorg, bdf2psf, bdftopcf 3 + , libfaketime 4 4 }: 5 5 6 6 stdenv.mkDerivation rec { ··· 15 15 }; 16 16 17 17 nativeBuildInputs = 18 - [ mkfontscale bdf2psf bdftopcf 19 - fonttosfnt libfaketime 18 + [ xorg.mkfontscale bdf2psf bdftopcf 19 + xorg.fonttosfnt libfaketime 20 20 ]; 21 21 22 22 buildPhase = ''
+2 -2
pkgs/data/fonts/profont/default.nix
··· 1 - { lib, stdenv, fetchzip, mkfontscale }: 1 + { lib, stdenv, fetchzip, xorg }: 2 2 3 3 stdenv.mkDerivation { 4 4 pname = "profont"; ··· 20 20 21 21 dontBuild = true; 22 22 23 - nativeBuildInputs = [ mkfontscale ]; 23 + nativeBuildInputs = [ xorg.mkfontscale ]; 24 24 25 25 installPhase = '' 26 26 mkdir -p "$out/share/fonts/misc"
+2 -2
pkgs/data/fonts/siji/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, libfaketime, fonttosfnt, mkfontscale }: 1 + { lib, stdenv, fetchFromGitHub, libfaketime, xorg }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 name = "siji-${version}"; ··· 11 11 sha256 = "1408g4nxwdd682vjqpmgv0cp0bfnzzzwls62cjs9zrds16xa9dpf"; 12 12 }; 13 13 14 - nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; 14 + nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ]; 15 15 16 16 buildPhase = '' 17 17 # compress pcf fonts
+2 -2
pkgs/data/fonts/spleen/default.nix
··· 1 - { lib, fetchurl, mkfontscale }: 1 + { lib, fetchurl, xorg }: 2 2 3 3 let 4 4 pname = "spleen"; ··· 17 17 install -m644 fonts.alias-spleen $d/fonts.alias 18 18 19 19 # create fonts.dir so NixOS xorg module adds to fp 20 - ${mkfontscale}/bin/mkfontdir "$d" 20 + ${xorg.mkfontscale}/bin/mkfontdir "$d" 21 21 ''; 22 22 sha256 = "sha256-6Imsa0ku8On63di0DOo0QxBa0t+tbtPRxM531EIiG94="; 23 23
+2 -2
pkgs/data/fonts/tamsyn/default.nix
··· 1 - { lib, stdenv, fetchurl, fontforge, mkfontscale }: 1 + { lib, stdenv, fetchurl, fontforge, xorg }: 2 2 3 3 let 4 4 version = "1.11"; ··· 11 11 sha256 = "0kpjzdj8sv5871b8827mjgj9dswk75h94jj5iia2bds18ih1pglp"; 12 12 }; 13 13 14 - nativeBuildInputs = [ fontforge mkfontscale ]; 14 + nativeBuildInputs = [ fontforge xorg.mkfontscale ]; 15 15 16 16 unpackPhase = '' 17 17 tar -xzf $src --strip-components=1
+2 -2
pkgs/data/fonts/tamzen/default.nix
··· 1 - { fetchFromGitHub, mkfontscale, lib, stdenv }: 1 + { fetchFromGitHub, xorg, lib, stdenv }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "tamzen-font"; ··· 11 11 sha256 = "00x5fipzqimglvshhqwycdhaqslbvn3rl06jnswhyxfvz16ymj7s"; 12 12 }; 13 13 14 - nativeBuildInputs = [ mkfontscale ]; 14 + nativeBuildInputs = [ xorg.mkfontscale ]; 15 15 16 16 installPhase = '' 17 17 install -m 644 -D otb/*.otb pcf/*.pcf -t "$out/share/fonts/misc"
+2 -2
pkgs/data/fonts/terminus-font/default.nix
··· 1 1 { lib, stdenv, fetchurl, python3 2 - , bdftopcf, mkfontscale 2 + , bdftopcf, xorg 3 3 }: 4 4 5 5 stdenv.mkDerivation rec { ··· 14 14 patches = [ ./SOURCE_DATE_EPOCH-for-otb.patch ]; 15 15 16 16 nativeBuildInputs = 17 - [ python3 bdftopcf mkfontscale ]; 17 + [ python3 bdftopcf xorg.mkfontscale ]; 18 18 19 19 enableParallelBuilding = true; 20 20
+4 -4
pkgs/data/fonts/tewi/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, python3 2 - , bdftopcf, mkfontscale 3 - , libfaketime, fonttosfnt 2 + , bdftopcf, xorg 3 + , libfaketime, 4 4 }: 5 5 6 6 stdenv.mkDerivation rec { ··· 15 15 }; 16 16 17 17 nativeBuildInputs = 18 - [ python3 bdftopcf mkfontscale 19 - libfaketime fonttosfnt 18 + [ python3 bdftopcf xorg.mkfontscale 19 + libfaketime xorg.fonttosfnt 20 20 ]; 21 21 22 22 postPatch = ''
+3 -3
pkgs/data/fonts/ucs-fonts/default.nix
··· 1 1 { lib, stdenv, fetchurl, bdftopcf 2 - , libfaketime, fonttosfnt, mkfontscale 2 + , libfaketime, xorg 3 3 }: 4 4 5 5 stdenv.mkDerivation { ··· 24 24 sourceRoot = "."; 25 25 26 26 nativeBuildInputs = 27 - [ bdftopcf libfaketime fonttosfnt 28 - mkfontscale 27 + [ bdftopcf libfaketime xorg.fonttosfnt 28 + xorg.mkfontscale 29 29 ]; 30 30 31 31 buildPhase = ''
+2 -2
pkgs/data/fonts/uni-vga/default.nix
··· 1 1 { lib, stdenv, fetchurl, perl, kbd, bdftopcf 2 - , libfaketime, fonttosfnt, mkfontscale 2 + , libfaketime, xorg 3 3 }: 4 4 5 5 stdenv.mkDerivation { ··· 12 12 13 13 nativeBuildInputs = 14 14 [ bdftopcf libfaketime 15 - fonttosfnt mkfontscale 15 + xorg.fonttosfnt xorg.mkfontscale 16 16 ] ++ lib.optionals stdenv.isLinux [ perl kbd ]; 17 17 18 18 postPatch = "patchShebangs .";
+3 -3
pkgs/data/fonts/unifont/default.nix
··· 1 - { lib, stdenv, fetchurl, mkfontscale 2 - , libfaketime, fonttosfnt 1 + { lib, stdenv, fetchurl, xorg 2 + , libfaketime 3 3 }: 4 4 5 5 stdenv.mkDerivation rec { ··· 16 16 hash = "sha256-77rkcU0YajAVugWHnGscaFvcFTgWm+1WPLknQZvTjN0="; 17 17 }; 18 18 19 - nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; 19 + nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ]; 20 20 21 21 dontUnpack = true; 22 22
+2 -3
pkgs/data/fonts/uw-ttyp0/default.nix
··· 1 1 { lib, stdenv, fetchurl, perl 2 - , bdftopcf, bdf2psf, mkfontdir 3 - , fonttosfnt 2 + , bdftopcf, bdf2psf, xorg 4 3 , targetsDat ? null 5 4 , variantsDat ? null 6 5 }: ··· 17 16 # remove for version >1.3 18 17 patches = [ ./determinism.patch ]; 19 18 20 - nativeBuildInputs = [ perl bdftopcf bdf2psf fonttosfnt mkfontdir ]; 19 + nativeBuildInputs = [ perl bdftopcf bdf2psf xorg.fonttosfnt xorg.mkfontdir ]; 21 20 22 21 # configure sizes, encodings and variants 23 22 preConfigure =
+2 -5
pkgs/development/libraries/geis/default.nix
··· 10 10 , gobject-introspection 11 11 , grail 12 12 , gtk3 13 - , libX11 14 - , libXext 15 - , libXi 16 - , libXtst 13 + , xorg 17 14 , pango 18 15 , xorgserver 19 16 }: ··· 38 35 39 36 nativeBuildInputs = [ pkg-config wrapGAppsHook python3Packages.wrapPython]; 40 37 buildInputs = [ atk dbus evemu frame gdk-pixbuf gobject-introspection grail 41 - gtk3 libX11 libXext libXi libXtst pango python3Packages.python xorgserver 38 + gtk3 xorg.libX11 xorg.libXext xorg.libXi xorg.libXtst pango python3Packages.python xorgserver 42 39 ]; 43 40 44 41 patchPhase = ''
+3 -4
pkgs/development/libraries/libcaca/default.nix
··· 3 3 , fetchFromGitHub 4 4 , autoreconfHook 5 5 , imlib2 6 - , libX11 7 - , libXext 6 + , xorg 8 7 , ncurses 9 8 , pkg-config 10 9 , zlib ··· 32 31 zlib 33 32 (imlib2.override { inherit x11Support; }) 34 33 ] ++ lib.optionals x11Support [ 35 - libX11 36 - libXext 34 + xorg.libX11 35 + xorg.libXext 37 36 ]; 38 37 39 38 outputs = [ "bin" "dev" "out" "man" ];
+3 -3
pkgs/development/libraries/plplot/default.nix
··· 6 6 , wxGTK32 7 7 , Cocoa 8 8 , enableXWin ? false 9 - , libX11 9 + , xorg 10 10 }: 11 11 12 12 stdenv.mkDerivation rec { ··· 22 22 23 23 buildInputs = lib.optional enableWX wxGTK32 24 24 ++ lib.optional (enableWX && stdenv.isDarwin) Cocoa 25 - ++ lib.optional enableXWin libX11; 25 + ++ lib.optional enableXWin xorg.libX11; 26 26 27 27 passthru = { 28 + inherit (xorg) libX11; 28 29 inherit 29 30 enableWX 30 31 enableXWin 31 - libX11 32 32 ; 33 33 }; 34 34
+4 -4
pkgs/development/libraries/wlroots/0.14.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland-scanner 2 2 , libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman 3 - , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa 4 - , libpng, ffmpeg_4, xcbutilrenderutil, seatd 3 + , libcap, mesa, xorg 4 + , libpng, ffmpeg_4, seatd 5 5 6 6 , enableXWayland ? true, xwayland ? null 7 7 }: ··· 27 27 28 28 buildInputs = [ 29 29 libGL wayland wayland-protocols libinput libxkbcommon pixman 30 - xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa 31 - libpng ffmpeg_4 xcbutilrenderutil seatd 30 + xorg.xcbutilwm xorg.libX11 libcap xorg.xcbutilimage xorg.xcbutilerrors mesa 31 + libpng ffmpeg_4 xorg.xcbutilrenderutil seatd 32 32 ] 33 33 ++ lib.optional enableXWayland xwayland 34 34 ;
+4 -4
pkgs/development/libraries/wlroots/0.15.nix
··· 1 1 { lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, wayland-scanner 2 2 , libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman 3 - , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa 4 - , libpng, ffmpeg_4, xcbutilrenderutil, seatd, vulkan-loader, glslang 3 + ,libcap, mesa, xorg 4 + , libpng, ffmpeg_4, seatd, vulkan-loader, glslang 5 5 , nixosTests 6 6 7 7 , enableXWayland ? true, xwayland ? null ··· 29 29 30 30 buildInputs = [ 31 31 libGL wayland wayland-protocols libinput libxkbcommon pixman 32 - xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa 33 - libpng ffmpeg_4 xcbutilrenderutil seatd vulkan-loader 32 + xorg.xcbutilwm xorg.libX11 libcap xorg.xcbutilimage xorg.xcbutilerrors mesa 33 + libpng ffmpeg_4 xorg.xcbutilrenderutil seatd vulkan-loader 34 34 ] 35 35 ++ lib.optional enableXWayland xwayland 36 36 ;
+4 -4
pkgs/development/misc/msp430/newlib.nix
··· 1 - { stdenvNoCC, lndir, newlib, msp430GccSupport }: 1 + { stdenvNoCC, xorg, newlib, msp430GccSupport }: 2 2 3 3 stdenvNoCC.mkDerivation { 4 4 name = "msp430-${newlib.name}"; ··· 10 10 11 11 buildCommand = '' 12 12 mkdir $out 13 - ${lndir}/bin/lndir -silent $newlib $out 14 - ${lndir}/bin/lndir -silent $msp430GccSupport/include $out/${newlib.incdir} 15 - ${lndir}/bin/lndir -silent $msp430GccSupport/lib $out/${newlib.libdir} 13 + ${xorg.lndir}/bin/lndir -silent $newlib $out 14 + ${xorg.lndir}/bin/lndir -silent $msp430GccSupport/include $out/${newlib.incdir} 15 + ${xorg.lndir}/bin/lndir -silent $msp430GccSupport/lib $out/${newlib.libdir} 16 16 ''; 17 17 18 18 passthru = {
+3 -7
pkgs/development/tools/misc/slint-lsp/default.nix
··· 6 6 , cmake 7 7 , fontconfig 8 8 , libGL 9 - , libxcb 10 - , libX11 11 - , libXcursor 12 - , libXi 13 - , libXrandr 9 + , xorg 14 10 , libxkbcommon 15 11 , wayland 16 12 # Darwin Frameworks ··· 24 20 }: 25 21 26 22 let 27 - rpathLibs = [ fontconfig libGL libxcb libX11 libXcursor libXrandr libXi ] 23 + rpathLibs = [ fontconfig libGL xorg.libxcb xorg.libX11 xorg.libXcursor xorg.libXrandr xorg.libXi ] 28 24 ++ lib.optionals stdenv.isLinux [ libxkbcommon wayland ]; 29 25 in 30 26 rustPlatform.buildRustPackage rec { ··· 39 35 cargoSha256 = "sha256-9zbA9JXfLdosCU6gVsrsAyiyX8Qh6x5wMw1W4QKqbp4="; 40 36 41 37 nativeBuildInputs = [ cmake pkg-config fontconfig ]; 42 - buildInputs = rpathLibs ++ [ libxcb.dev ] 38 + buildInputs = rpathLibs ++ [ xorg.libxcb.dev ] 43 39 ++ lib.optionals stdenv.isDarwin [ 44 40 AppKit 45 41 CoreGraphics
+6 -10
pkgs/development/tools/rust/cargo-ui/default.nix
··· 8 8 , stdenv 9 9 , fontconfig 10 10 , libGL 11 - , libX11 12 - , libXcursor 13 - , libXi 14 - , libXrandr 15 - , libxcb 11 + , xorg 16 12 }: 17 13 18 14 rustPlatform.buildRustPackage rec { ··· 33 29 buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ 34 30 fontconfig 35 31 libGL 36 - libX11 37 - libXcursor 38 - libXi 39 - libXrandr 40 - libxcb 32 + xorg.libX11 33 + xorg.libXcursor 34 + xorg.libXi 35 + xorg.libXrandr 36 + xorg.libxcb 41 37 ]; 42 38 43 39 postInstall = lib.optionalString stdenv.isLinux ''
+3 -4
pkgs/games/jumpy/default.nix
··· 5 5 , pkg-config 6 6 , alsa-lib 7 7 , libGL 8 - , libX11 9 - , libXi 8 + , xorg 10 9 , udev 11 10 , Cocoa 12 11 , OpenGL ··· 32 31 buildInputs = lib.optionals stdenv.isLinux [ 33 32 alsa-lib 34 33 libGL 35 - libX11 36 - libXi 34 + xorg.libX11 35 + xorg.libXi 37 36 udev 38 37 ] ++ lib.optionals stdenv.isDarwin [ 39 38 Cocoa
+2 -4
pkgs/misc/screensavers/betterlockscreen/default.nix
··· 14 14 , gnused 15 15 , imagemagick 16 16 , procps 17 - , xdpyinfo 18 - , xrandr 19 - , xset 17 + , xorg 20 18 }: 21 19 22 20 stdenv.mkDerivation rec { ··· 38 36 mkdir -p $out/bin 39 37 cp betterlockscreen $out/bin/betterlockscreen 40 38 wrapProgram "$out/bin/betterlockscreen" \ 41 - --prefix PATH : "$out/bin:${lib.makeBinPath [ bc coreutils dbus dunst i3lock-color gawk gnugrep gnused imagemagick procps xdpyinfo xrandr xset ]}" 39 + --prefix PATH : "$out/bin:${lib.makeBinPath [ bc coreutils dbus dunst i3lock-color gawk gnugrep gnused imagemagick procps xorg.xdpyinfo xorg.xrandr xorg.xset ]}" 42 40 43 41 runHook postInstall 44 42 '';
+4 -5
pkgs/tools/X11/sx/default.nix
··· 3 3 , coreutils 4 4 , fetchFromGitHub 5 5 , resholve 6 - , xauth 7 - , xorgserver 6 + , xorg 8 7 }: 9 8 10 9 resholve.mkDerivation rec { ··· 26 25 interpreter = "${bash}/bin/sh"; 27 26 inputs = [ 28 27 coreutils 29 - xauth 30 - xorgserver 28 + xorg.xauth 29 + xorg.xorgserver 31 30 ]; 32 31 execer = [ 33 - "cannot:${xorgserver}/bin/Xorg" 32 + "cannot:${xorg.xorgserver}/bin/Xorg" 34 33 ]; 35 34 }; 36 35 };
+2 -2
pkgs/tools/graphics/gromit-mpx/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, cmake, pkg-config 2 - , gtk, glib, pcre, libappindicator, libpthreadstubs, libXdmcp 2 + , gtk, glib, pcre, libappindicator, libpthreadstubs, xorg 3 3 , libxkbcommon, libepoxy, at-spi2-core, dbus, libdbusmenu 4 4 , wrapGAppsHook 5 5 }: ··· 18 18 nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; 19 19 buildInputs = [ 20 20 gtk glib pcre libappindicator libpthreadstubs 21 - libXdmcp libxkbcommon libepoxy at-spi2-core 21 + xorg.libXdmcp libxkbcommon libepoxy at-spi2-core 22 22 dbus libdbusmenu 23 23 ]; 24 24
+2 -2
pkgs/tools/inputmethods/m17n-lib/otf.nix
··· 1 - { lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, libXaw, freetype }: 1 + { lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, xorg, freetype }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "libotf"; ··· 31 31 32 32 nativeBuildInputs = [ pkg-config autoreconfHook ]; 33 33 34 - buildInputs = [ libXaw freetype ]; 34 + buildInputs = [ xorg.libXaw freetype ]; 35 35 36 36 outputs = [ "out" "dev" ]; 37 37
+2 -2
pkgs/tools/misc/broot/default.nix
··· 9 9 , oniguruma 10 10 , libiconv 11 11 , Security 12 - , libxcb 12 + , xorg 13 13 , zlib 14 14 }: 15 15 ··· 30 30 pkg-config 31 31 ]; 32 32 33 - buildInputs = [ libgit2 oniguruma libxcb ] ++ lib.optionals stdenv.isDarwin [ 33 + buildInputs = [ libgit2 oniguruma xorg.libxcb ] ++ lib.optionals stdenv.isDarwin [ 34 34 libiconv 35 35 Security 36 36 zlib
+2 -2
pkgs/tools/misc/wootility/default.nix
··· 1 1 { appimageTools 2 2 , fetchurl 3 3 , lib 4 - , libxkbfile 4 + , xorg 5 5 , udev 6 6 , wooting-udev-rules 7 7 }: ··· 26 26 pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ ([ 27 27 udev 28 28 wooting-udev-rules 29 - libxkbfile 29 + xorg.libxkbfile 30 30 ]); 31 31 extraInstallCommands = "mv $out/bin/{${name},${pname}}"; 32 32
+31 -83
pkgs/top-level/all-packages.nix
··· 1558 1558 1559 1559 libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { }; 1560 1560 1561 - maiko = callPackage ../applications/emulators/maiko { 1562 - inherit (xorg) libX11; 1563 - }; 1561 + maiko = callPackage ../applications/emulators/maiko { }; 1564 1562 1565 1563 mame = libsForQt514.callPackage ../applications/emulators/mame { 1566 1564 inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback; ··· 1815 1813 ### APPLICATIONS/TERMINAL-EMULATORS 1816 1814 1817 1815 alacritty = callPackage ../applications/terminal-emulators/alacritty { 1818 - inherit (xorg) libXcursor libXxf86vm libXi; 1819 1816 inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; 1820 1817 }; 1821 1818 ··· 3178 3175 3179 3176 broot = callPackage ../tools/misc/broot { 3180 3177 inherit (darwin.apple_sdk.frameworks) Security; 3181 - inherit (xorg) libxcb; 3182 3178 }; 3183 3179 3184 3180 bruteforce-luks = callPackage ../tools/security/bruteforce-luks { }; ··· 4485 4481 4486 4482 morsel = callPackage ../tools/text/morsel {}; 4487 4483 4488 - mousetweaks = callPackage ../applications/accessibility/mousetweaks { 4489 - inherit (xorg) libX11 libXtst libXfixes; 4490 - }; 4484 + mousetweaks = callPackage ../applications/accessibility/mousetweaks { }; 4491 4485 4492 4486 mp3blaster = callPackage ../applications/audio/mp3blaster { }; 4493 4487 ··· 5338 5332 5339 5333 m17n_lib = callPackage ../tools/inputmethods/m17n-lib { }; 5340 5334 5341 - libotf = callPackage ../tools/inputmethods/m17n-lib/otf.nix { 5342 - inherit (xorg) libXaw; 5343 - }; 5335 + libotf = callPackage ../tools/inputmethods/m17n-lib/otf.nix { }; 5344 5336 5345 5337 netbird = callPackage ../tools/networking/netbird { 5346 5338 inherit (darwin.apple_sdk_11_0.frameworks) Cocoa IOKit Kernel UserNotifications WebKit; ··· 7349 7341 gromit-mpx = callPackage ../tools/graphics/gromit-mpx { 7350 7342 gtk = gtk3; 7351 7343 libappindicator = libappindicator-gtk3; 7352 - inherit (xorg) libXdmcp; 7353 7344 }; 7354 7345 7355 7346 gron = callPackage ../development/tools/gron { }; ··· 7503 7494 pixz = callPackage ../tools/compression/pixz { }; 7504 7495 7505 7496 plplot = callPackage ../development/libraries/plplot { 7506 - inherit (xorg) libX11; 7507 7497 inherit (darwin.apple_sdk.frameworks) Cocoa; 7508 7498 }; 7509 7499 ··· 11635 11625 11636 11626 squeekboard = callPackage ../applications/accessibility/squeekboard { }; 11637 11627 11638 - sx = callPackage ../tools/X11/sx { 11639 - inherit (xorg) xauth xorgserver; 11640 - }; 11628 + sx = callPackage ../tools/X11/sx { }; 11641 11629 11642 11630 systemdgenie = libsForQt5.callPackage ../applications/system/systemdgenie { }; 11643 11631 ··· 11994 11982 11995 11983 trdl-client = callPackage ../tools/misc/trdl-client { }; 11996 11984 11997 - trenchbroom = libsForQt5.callPackage ../applications/misc/trenchbroom { 11998 - inherit (xorg) libXxf86vm; 11999 - }; 11985 + trenchbroom = libsForQt5.callPackage ../applications/misc/trenchbroom { }; 12000 11986 12001 11987 trickle = callPackage ../tools/networking/trickle {}; 12002 11988 ··· 12422 12408 12423 12409 woof = callPackage ../tools/misc/woof { }; 12424 12410 12425 - wootility = callPackage ../tools/misc/wootility { 12426 - inherit (xorg) libxkbfile; 12427 - }; 12411 + wootility = callPackage ../tools/misc/wootility { }; 12428 12412 12429 12413 wormhole-william = callPackage ../tools/networking/wormhole-william { }; 12430 12414 ··· 14871 14855 inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; 14872 14856 }; 14873 14857 cargo-ui = callPackage ../development/tools/rust/cargo-ui { 14874 - inherit (xorg) libX11 libXcursor libXi libXrandr libxcb; 14875 14858 inherit (darwin.apple_sdk.frameworks); 14876 14859 }; 14877 14860 ··· 15860 15843 15861 15844 msp430Newlib = callPackage ../development/misc/msp430/newlib.nix { }; 15862 15845 msp430NewlibCross = callPackage ../development/misc/msp430/newlib.nix { 15863 - inherit (buildPackages.xorg) lndir; 15864 15846 newlib = newlibCross; 15865 15847 }; 15866 15848 ··· 16723 16705 16724 16706 flexcpp = callPackage ../development/tools/parsing/flexc++ { }; 16725 16707 16726 - geis = callPackage ../development/libraries/geis { 16727 - inherit (xorg) libX11 libXext libXi libXtst; 16728 - }; 16708 + geis = callPackage ../development/libraries/geis { }; 16729 16709 16730 16710 gi-docgen = callPackage ../development/tools/documentation/gi-docgen { }; 16731 16711 ··· 17442 17422 slimerjs = callPackage ../development/tools/slimerjs {}; 17443 17423 17444 17424 slint-lsp = callPackage ../development/tools/misc/slint-lsp { 17445 - inherit (xorg) libXcursor libXi; 17446 17425 inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; 17447 17426 }; 17448 17427 ··· 19570 19549 19571 19550 libbytesize = callPackage ../development/libraries/libbytesize { }; 19572 19551 19573 - libcaca = callPackage ../development/libraries/libcaca { 19574 - inherit (xorg) libX11 libXext; 19575 - }; 19552 + libcaca = callPackage ../development/libraries/libcaca { }; 19576 19553 19577 19554 libcacard = callPackage ../development/libraries/libcacard { }; 19578 19555 ··· 25739 25716 25740 25717 changie = callPackage ../development/tools/changie { }; 25741 25718 25742 - cherry = callPackage ../data/fonts/cherry { inherit (xorg) fonttosfnt mkfontdir; }; 25719 + cherry = callPackage ../data/fonts/cherry { }; 25743 25720 25744 25721 chonburi-font = callPackage ../data/fonts/chonburi { }; 25745 25722 ··· 25773 25750 25774 25751 culmus = callPackage ../data/fonts/culmus { }; 25775 25752 25776 - clearlyU = callPackage ../data/fonts/clearlyU 25777 - { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; 25753 + clearlyU = callPackage ../data/fonts/clearlyU { }; 25778 25754 25779 25755 cm_unicode = callPackage ../data/fonts/cm-unicode {}; 25780 25756 25781 - creep = callPackage ../data/fonts/creep 25782 - { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; 25757 + creep = callPackage ../data/fonts/creep { }; 25783 25758 25784 25759 crimson = callPackage ../data/fonts/crimson {}; 25785 25760 ··· 25791 25766 paths = [ dejavu_fonts.out ]; 25792 25767 }; 25793 25768 25794 - dina-font = callPackage ../data/fonts/dina 25795 - { inherit (buildPackages.xorg) mkfontscale; }; 25769 + dina-font = callPackage ../data/fonts/dina { }; 25796 25770 25797 25771 dns-root-data = callPackage ../data/misc/dns-root-data { }; 25798 25772 ··· 25890 25864 25891 25865 encode-sans = callPackage ../data/fonts/encode-sans { }; 25892 25866 25893 - envypn-font = callPackage ../data/fonts/envypn-font 25894 - { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; 25867 + envypn-font = callPackage ../data/fonts/envypn-font { }; 25895 25868 25896 25869 execline-man-pages = skawarePackages.execline-man-pages; 25897 25870 ··· 25937 25910 25938 25911 geolite-legacy = callPackage ../data/misc/geolite-legacy { }; 25939 25912 25940 - gohufont = callPackage ../data/fonts/gohufont 25941 - { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; 25913 + gohufont = callPackage ../data/fonts/gohufont { }; 25942 25914 25943 25915 gnome-user-docs = callPackage ../data/documentation/gnome-user-docs { }; 25944 25916 ··· 26382 26354 inherit (darwin.apple_sdk.frameworks) Security; 26383 26355 }; 26384 26356 26385 - profont = callPackage ../data/fonts/profont 26386 - { inherit (buildPackages.xorg) mkfontscale; }; 26357 + profont = callPackage ../data/fonts/profont { }; 26387 26358 26388 26359 proggyfonts = callPackage ../data/fonts/proggyfonts { }; 26389 26360 ··· 26533 26504 26534 26505 scientifica = callPackage ../data/fonts/scientifica { }; 26535 26506 26536 - siji = callPackage ../data/fonts/siji 26537 - { inherit (buildPackages.xorg) mkfontscale fonttosfnt; }; 26507 + siji = callPackage ../data/fonts/siji { }; 26538 26508 26539 26509 sound-theme-freedesktop = callPackage ../data/misc/sound-theme-freedesktop { }; 26540 26510 ··· 26553 26523 source-han-serif = sourceHanPackages.serif; 26554 26524 source-han-mono = sourceHanPackages.mono; 26555 26525 26556 - spleen = callPackage ../data/fonts/spleen { inherit (buildPackages.xorg) mkfontscale; }; 26526 + spleen = callPackage ../data/fonts/spleen { }; 26557 26527 26558 26528 stilo-themes = callPackage ../data/themes/stilo { }; 26559 26529 ··· 26565 26535 26566 26536 taskspooler = callPackage ../tools/system/taskspooler { }; 26567 26537 26568 - tamsyn = callPackage ../data/fonts/tamsyn { inherit (buildPackages.xorg) mkfontscale; }; 26538 + tamsyn = callPackage ../data/fonts/tamsyn { }; 26569 26539 26570 - tamzen = callPackage ../data/fonts/tamzen { inherit (buildPackages.xorg) mkfontscale; }; 26540 + tamzen = callPackage ../data/fonts/tamzen { }; 26571 26541 26572 26542 tango-icon-theme = callPackage ../data/icons/tango-icon-theme { 26573 26543 gtk = res.gtk2; ··· 26591 26561 26592 26562 tenderness = callPackage ../data/fonts/tenderness { }; 26593 26563 26594 - terminus_font = callPackage ../data/fonts/terminus-font 26595 - { inherit (buildPackages.xorg) mkfontscale; }; 26564 + terminus_font = callPackage ../data/fonts/terminus-font { }; 26596 26565 26597 26566 terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { }; 26598 26567 ··· 26628 26597 26629 26598 ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { }; 26630 26599 26631 - ucs-fonts = callPackage ../data/fonts/ucs-fonts 26632 - { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; 26600 + ucs-fonts = callPackage ../data/fonts/ucs-fonts { }; 26633 26601 26634 26602 bront_fonts = callPackage ../data/fonts/bront { }; 26635 26603 ··· 26641 26609 26642 26610 unfonts-core = callPackage ../data/fonts/unfonts-core { }; 26643 26611 26644 - uni-vga = callPackage ../data/fonts/uni-vga 26645 - { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; 26612 + uni-vga = callPackage ../data/fonts/uni-vga { }; 26646 26613 26647 26614 unicode-character-database = callPackage ../data/misc/unicode-character-database { }; 26648 26615 ··· 26650 26617 26651 26618 unihan-database = callPackage ../data/misc/unihan-database { }; 26652 26619 26653 - unifont = callPackage ../data/fonts/unifont 26654 - { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; 26620 + unifont = callPackage ../data/fonts/unifont { }; 26655 26621 26656 26622 unifont_upper = callPackage ../data/fonts/unifont_upper { }; 26657 26623 26658 26624 unscii = callPackage ../data/fonts/unscii { }; 26659 26625 26660 - uw-ttyp0 = callPackage ../data/fonts/uw-ttyp0 { inherit (xorg) fonttosfnt mkfontdir; }; 26626 + uw-ttyp0 = callPackage ../data/fonts/uw-ttyp0 { }; 26661 26627 26662 26628 u001-font = callPackage ../data/fonts/u001 { }; 26663 26629 ··· 27325 27291 27326 27292 ciscoPacketTracer8 = callPackage ../applications/networking/cisco-packet-tracer/8.nix { }; 27327 27293 27328 - claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { 27329 - inherit (xorg) libSM; 27330 - }; 27294 + claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { }; 27331 27295 27332 27296 cligh = python3Packages.callPackage ../development/tools/github/cligh {}; 27333 27297 ··· 27785 27749 27786 27750 epick = callPackage ../applications/graphics/epick { 27787 27751 inherit (darwin.apple_sdk.frameworks) AppKit IOKit; 27788 - inherit (xorg) libX11 libXcursor libXi libXrandr libxcb; 27789 27752 }; 27790 27753 27791 27754 epr = callPackage ../applications/misc/epr { }; ··· 28942 28905 }; 28943 28906 28944 28907 wlroots = wlroots_0_15; 28945 - wlroots_0_14 = callPackage ../development/libraries/wlroots/0.14.nix { 28946 - inherit (xorg) xcbutilrenderutil; 28947 - }; 28948 - wlroots_0_15 = callPackage ../development/libraries/wlroots/0.15.nix { 28949 - inherit (xorg) xcbutilrenderutil; 28950 - }; 28908 + wlroots_0_14 = callPackage ../development/libraries/wlroots/0.14.nix { }; 28909 + wlroots_0_15 = callPackage ../development/libraries/wlroots/0.15.nix { }; 28951 28910 28952 28911 sway-unwrapped = callPackage ../applications/window-managers/sway { }; 28953 28912 sway = callPackage ../applications/window-managers/sway/wrapper.nix { }; ··· 28970 28929 28971 28930 tiramisu = callPackage ../applications/misc/tiramisu { }; 28972 28931 28973 - rlaunch = callPackage ../applications/misc/rlaunch { 28974 - inherit (xorg) libX11 libXft libXinerama; 28975 - }; 28932 + rlaunch = callPackage ../applications/misc/rlaunch { }; 28976 28933 28977 28934 rootbar = callPackage ../applications/misc/rootbar {}; 28978 28935 ··· 29032 28989 29033 28990 i3lock-pixeled = callPackage ../misc/screensavers/i3lock-pixeled { }; 29034 28991 29035 - betterlockscreen = callPackage ../misc/screensavers/betterlockscreen { 29036 - inherit (xorg) xdpyinfo xrandr xset; 29037 - }; 28992 + betterlockscreen = callPackage ../misc/screensavers/betterlockscreen { }; 29038 28993 29039 28994 multilockscreen = callPackage ../misc/screensavers/multilockscreen { }; 29040 28995 ··· 29194 29149 inkscape-extensions = recurseIntoAttrs (callPackages ../applications/graphics/inkscape/extensions.nix {}); 29195 29150 29196 29151 inlyne = callPackage ../applications/misc/inlyne { 29197 - inherit (xorg) libX11 libXcursor libXi libXrandr libxcb; 29198 29152 inherit (darwin) libobjc; 29199 29153 inherit (darwin.apple_sdk.frameworks) AppKit ApplicationServices CoreFoundation CoreGraphics CoreServices CoreText CoreVideo Foundation Metal QuartzCore Security; 29200 29154 }; ··· 29879 29833 menumaker = callPackage ../applications/misc/menumaker { }; 29880 29834 29881 29835 menyoki = callPackage ../applications/graphics/menyoki { 29882 - inherit (xorg) libX11 libXrandr; 29883 29836 inherit (darwin.apple_sdk.frameworks) AppKit; 29884 29837 }; 29885 29838 ··· 31522 31475 31523 31476 lightdm_qt = lightdm.override { withQt5 = true; }; 31524 31477 31525 - lightdm-enso-os-greeter = callPackage ../applications/display-managers/lightdm-enso-os-greeter { 31526 - inherit (xorg) libX11 libXdmcp libpthreadstubs; 31527 - }; 31478 + lightdm-enso-os-greeter = callPackage ../applications/display-managers/lightdm-enso-os-greeter { }; 31528 31479 31529 31480 lightdm-gtk-greeter = callPackage ../applications/display-managers/lightdm/gtk-greeter.nix { 31530 31481 inherit (xfce) xfce4-dev-tools; ··· 32625 32576 32626 32577 xastir = callPackage ../applications/misc/xastir { 32627 32578 rastermagick = imagemagick6; 32628 - inherit (xorg) libXt; 32629 32579 }; 32630 32580 32631 32581 xautomation = callPackage ../tools/X11/xautomation { }; ··· 33701 33651 fish-fillets-ng = callPackage ../games/fish-fillets-ng { }; 33702 33652 33703 33653 jumpy = callPackage ../games/jumpy { 33704 - inherit (xorg) libX11 libXi; 33705 33654 inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; 33706 33655 }; 33707 33656 ··· 36859 36808 36860 36809 tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; }; 36861 36810 36862 - tewi-font = callPackage ../data/fonts/tewi 36863 - { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; 36811 + tewi-font = callPackage ../data/fonts/tewi { }; 36864 36812 36865 36813 texFunctions = callPackage ../tools/typesetting/tex/nix pkgs; 36866 36814