3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #195874 from Artturin/removeinheritxorg

This commit is contained in:
Artturi 2022-10-15 04:27:23 +03:00 committed by GitHub
commit 56cbdc3b83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
45 changed files with 158 additions and 243 deletions

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, pkg-config { lib, stdenv, fetchurl, pkg-config
, glib, gtk3, gnome, gsettings-desktop-schemas, wrapGAppsHook , glib, gtk3, gnome, gsettings-desktop-schemas, wrapGAppsHook
, libX11, libXtst, libXfixes, libXcursor , xorg
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
glib gtk3 gsettings-desktop-schemas glib gtk3 gsettings-desktop-schemas
libX11 libXtst libXfixes libXcursor xorg.libX11 xorg.libXtst xorg.libXfixes xorg.libXcursor
]; ];
passthru = { passthru = {

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, linkFarm, lightdm-enso-os-greeter { lib, stdenv, fetchFromGitHub, pkg-config, linkFarm, lightdm-enso-os-greeter
, dbus, pcre, libepoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs , dbus, pcre, libepoxy, xorg, at-spi2-core, libxklavier, libxkbcommon
, gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }: , gtk3, vala, cmake, libgee, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "lightdm-enso-os-greeter"; pname = "lightdm-enso-os-greeter";
@ -30,15 +30,15 @@ stdenv.mkDerivation {
pcre pcre
libepoxy libepoxy
libgee libgee
libX11 xorg.libX11
lightdm lightdm
libXdmcp xorg.libXdmcp
gdk-pixbuf gdk-pixbuf
clutter-gtk clutter-gtk
libxklavier libxklavier
at-spi2-core at-spi2-core
libxkbcommon libxkbcommon
libpthreadstubs xorg.libpthreadstubs
librsvg librsvg
]; ];

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, libX11 }: { lib, stdenv, fetchFromGitHub, cmake, xorg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "maiko"; pname = "maiko";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
hash = "sha256-Y+ngep/xHw6RCU8XVRYSWH6S+9hJ74z50pGpIqS2CjM="; hash = "sha256-Y+ngep/xHw6RCU8XVRYSWH6S+9hJ74z50pGpIqS2CjM=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ libX11 ]; buildInputs = [ xorg.libX11 ];
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
find . -maxdepth 1 -executable -type f -exec install -Dt $out/bin '{}' \; find . -maxdepth 1 -executable -type f -exec install -Dt $out/bin '{}' \;
@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
homepage = "https://interlisp.org/"; homepage = "https://interlisp.org/";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ ehmry ]; maintainers = with maintainers; [ ehmry ];
inherit (libX11.meta) platforms; inherit (xorg.libX11.meta) platforms;
}; };
} }

View file

@ -4,11 +4,7 @@
, stdenv , stdenv
, python3 , python3
, libGL , libGL
, libX11 , xorg
, libXcursor
, libXi
, libXrandr
, libxcb
, libxkbcommon , libxkbcommon
, AppKit , AppKit
, IOKit , IOKit
@ -31,11 +27,11 @@ rustPlatform.buildRustPackage rec {
buildInputs = lib.optionals stdenv.isLinux [ buildInputs = lib.optionals stdenv.isLinux [
libGL libGL
libX11 xorg.libX11
libXcursor xorg.libXcursor
libXi xorg.libXi
libXrandr xorg.libXrandr
libxcb xorg.libxcb
libxkbcommon libxkbcommon
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
AppKit AppKit

View file

@ -6,8 +6,7 @@
, stdenv , stdenv
, withSixel ? false , withSixel ? false
, libsixel , libsixel
, libX11 , xorg
, libXrandr
, AppKit , AppKit
, withSki ? true , withSki ? true
}: }:
@ -29,7 +28,7 @@ rustPlatform.buildRustPackage rec {
++ lib.optional stdenv.isLinux pkg-config; ++ lib.optional stdenv.isLinux pkg-config;
buildInputs = lib.optional withSixel libsixel buildInputs = lib.optional withSixel libsixel
++ lib.optionals stdenv.isLinux [ libX11 libXrandr ] ++ lib.optionals stdenv.isLinux (with xorg; [ libX11 libXrandr ])
++ lib.optional stdenv.isDarwin AppKit; ++ lib.optional stdenv.isDarwin AppKit;
buildNoDefaultFeatures = !withSki; buildNoDefaultFeatures = !withSki;

View file

@ -4,12 +4,8 @@
, stdenv , stdenv
, pkg-config , pkg-config
, fontconfig , fontconfig
, libXcursor , xorg
, libXi
, libXrandr
, libxcb
, libGL , libGL
, libX11
, openssl , openssl
, AppKit , AppKit
, ApplicationServices , ApplicationServices
@ -42,10 +38,10 @@ rustPlatform.buildRustPackage rec {
buildInputs = lib.optionals stdenv.isLinux [ buildInputs = lib.optionals stdenv.isLinux [
fontconfig fontconfig
libXcursor xorg.libXcursor
libXi xorg.libXi
libXrandr xorg.libXrandr
libxcb xorg.libxcb
openssl openssl
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
AppKit AppKit
@ -64,7 +60,7 @@ rustPlatform.buildRustPackage rec {
postFixup = lib.optionalString stdenv.isLinux '' postFixup = lib.optionalString stdenv.isLinux ''
patchelf $out/bin/inlyne \ patchelf $out/bin/inlyne \
--add-rpath ${lib.makeLibraryPath [ libGL libX11 ]} --add-rpath ${lib.makeLibraryPath [ libGL xorg.libX11 ]}
''; '';
meta = with lib; { meta = with lib; {

View file

@ -1,9 +1,7 @@
{ lib { lib
, fetchFromGitHub , fetchFromGitHub
, rustPlatform , rustPlatform
, libX11 , xorg
, libXft
, libXinerama
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -21,7 +19,7 @@ rustPlatform.buildRustPackage rec {
# The x11_dl crate dlopen()s these libraries, so we have to inject them into rpath. # The x11_dl crate dlopen()s these libraries, so we have to inject them into rpath.
postFixup = '' postFixup = ''
patchelf --set-rpath ${lib.makeLibraryPath [ libX11 libXft libXinerama ]} $out/bin/rlaunch patchelf --set-rpath ${lib.makeLibraryPath (with xorg; [ libX11 libXft libXinerama ])} $out/bin/rlaunch
''; '';
meta = with lib; { meta = with lib; {

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitHub
, cmake, ninja, git, pandoc, pkg-config , cmake, ninja, git, pandoc, pkg-config
, libGL, libGLU, libXxf86vm, freeimage , libGL, libGLU, freeimage
, catch2, fmt, glew, miniz, tinyxml-2, xorg , catch2, fmt, glew, miniz, tinyxml-2, xorg
, qtbase, wrapQtAppsHook , qtbase, wrapQtAppsHook
, copyDesktopItems, makeDesktopItem , copyDesktopItems, makeDesktopItem
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake git pandoc wrapQtAppsHook copyDesktopItems pkg-config ]; nativeBuildInputs = [ cmake git pandoc wrapQtAppsHook copyDesktopItems pkg-config ];
buildInputs = [ buildInputs = [
libGL libGLU libXxf86vm freeimage qtbase catch2 fmt glew miniz tinyxml-2 libGL libGLU xorg.libXxf86vm freeimage qtbase catch2 fmt glew miniz tinyxml-2
xorg.libSM xorg.libSM
]; ];
QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}"; QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}";

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
, curl, db, libgeotiff , curl, db, libgeotiff
, libXpm, libXt, motif, pcre , xorg, motif, pcre
, perl, proj, rastermagick, shapelib , perl, proj, rastermagick, shapelib
}: }:
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
curl db libgeotiff curl db libgeotiff
libXpm libXt motif pcre xorg.libXpm xorg.libXt motif pcre
perl proj rastermagick shapelib perl proj rastermagick shapelib
]; ];

View file

@ -2,7 +2,7 @@
# at https://www.x.org/releases/individual/. # at https://www.x.org/releases/individual/.
# That is why this expression is not inside pkgs.xorg # That is why this expression is not inside pkgs.xorg
{ lib, stdenv, fetchurl, makeWrapper, libX11, pkg-config, libXaw }: { lib, stdenv, fetchurl, makeWrapper, xorg, pkg-config }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xfontsel"; pname = "xfontsel";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config makeWrapper ]; nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ libX11 libXaw ]; buildInputs = [ xorg.libX11 xorg.libXaw ];
# Without this, it gets Xmu as a dependency, but without rpath entry # Without this, it gets Xmu as a dependency, but without rpath entry
NIX_LDFLAGS = "-lXmu"; NIX_LDFLAGS = "-lXmu";

View file

@ -11,7 +11,7 @@
, enableSpellcheck ? true , enableSpellcheck ? true
# Arguments to include external libraries # Arguments to include external libraries
, enableLibSM ? true, libSM , enableLibSM ? true, xorg
, enableGnuTLS ? true, gnutls , enableGnuTLS ? true, gnutls
, enableEnchant ? enableSpellcheck, enchant , enableEnchant ? enableSpellcheck, enchant
, enableDbus ? true, dbus, dbus-glib , enableDbus ? true, dbus, dbus-glib
@ -76,7 +76,7 @@ let
{ flags = [ "ldap" ]; enabled = enableLdap; deps = [ openldap ]; } { flags = [ "ldap" ]; enabled = enableLdap; deps = [ openldap ]; }
{ flags = [ "libetpan" ]; enabled = enableLibetpan; deps = [ libetpan ]; } { flags = [ "libetpan" ]; enabled = enableLibetpan; deps = [ libetpan ]; }
{ flags = [ "libravatar-plugin" ]; enabled = enablePluginLibravatar; } { flags = [ "libravatar-plugin" ]; enabled = enablePluginLibravatar; }
{ flags = [ "libsm" ]; enabled = enableLibSM; deps = [ libSM ]; } { flags = [ "libsm" ]; enabled = enableLibSM; deps = [ xorg.libSM ]; }
{ flags = [ "litehtml_viewer-plugin" ]; enabled = enablePluginLitehtmlViewer; deps = [ gumbo ]; } { flags = [ "litehtml_viewer-plugin" ]; enabled = enablePluginLitehtmlViewer; deps = [ gumbo ]; }
{ flags = [ "mailmbox-plugin" ]; enabled = enablePluginMailmbox; } { flags = [ "mailmbox-plugin" ]; enabled = enablePluginMailmbox; }
{ flags = [ "managesieve-plugin" ]; enabled = enablePluginManageSieve; } { flags = [ "managesieve-plugin" ]; enabled = enablePluginManageSieve; }

View file

@ -16,12 +16,7 @@
, fontconfig , fontconfig
, freetype , freetype
, libGL , libGL
, libX11 , xorg
, libXcursor
, libXi
, libXrandr
, libXxf86vm
, libxcb
, libxkbcommon , libxkbcommon
, wayland , wayland
, xdg-utils , xdg-utils
@ -41,12 +36,12 @@ let
fontconfig fontconfig
freetype freetype
libGL libGL
libX11 xorg.libX11
libXcursor xorg.libXcursor
libXi xorg.libXi
libXrandr xorg.libXrandr
libXxf86vm xorg.libXxf86vm
libxcb xorg.libxcb
] ++ lib.optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
libxkbcommon libxkbcommon
wayland wayland

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fonttosfnt, mkfontdir }: { lib, stdenv, fetchFromGitHub, xorg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cherry"; pname = "cherry";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "13zkxwp6r6kcxv4x459vwscr0n0sik4a3kcz5xnmlpvcdnbxi586"; sha256 = "13zkxwp6r6kcxv4x459vwscr0n0sik4a3kcz5xnmlpvcdnbxi586";
}; };
nativeBuildInputs = [ fonttosfnt mkfontdir ]; nativeBuildInputs = [ xorg.fonttosfnt xorg.mkfontdir ];
buildPhase = '' buildPhase = ''
patchShebangs make.sh patchShebangs make.sh

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fonttosfnt, mkfontscale, libfaketime }: { lib, stdenv, fetchurl, xorg, libfaketime }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "clearlyU"; pname = "clearlyU";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1xn14jbv3m1khy7ydvad9ydkn7yygdbhjy9wm1v000jzjwr3lv21"; sha256 = "1xn14jbv3m1khy7ydvad9ydkn7yygdbhjy9wm1v000jzjwr3lv21";
}; };
nativeBuildInputs = [ fonttosfnt mkfontscale libfaketime ]; nativeBuildInputs = [ xorg.fonttosfnt xorg.mkfontscale libfaketime ];
buildPhase = '' buildPhase = ''
# convert bdf fonts to otb # convert bdf fonts to otb

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, libfaketime { lib, stdenv, fetchFromGitHub, libfaketime
, fonttosfnt, mkfontscale , xorg
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0zs21kznh1q883jfdgz74bb63i4lxlv98hj3ipp0wvsi6zw0vs8n"; sha256 = "0zs21kznh1q883jfdgz74bb63i4lxlv98hj3ipp0wvsi6zw0vs8n";
}; };
nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ];
buildPhase = '' buildPhase = ''
faketime -f "1970-01-01 00:00:01" fonttosfnt -g 2 -m 2 -o creep.otb creep.bdf faketime -f "1970-01-01 00:00:01" fonttosfnt -g 2 -m 2 -o creep.otb creep.bdf

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, unzip { lib, stdenv, fetchurl, unzip
, bdftopcf, mkfontscale, fonttosfnt , bdftopcf, xorg
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -14,7 +14,7 @@ stdenv.mkDerivation {
}; };
nativeBuildInputs = nativeBuildInputs =
[ unzip bdftopcf mkfontscale fonttosfnt ]; [ unzip bdftopcf xorg.mkfontscale xorg.fonttosfnt ];
postPatch = '' postPatch = ''
sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, libfaketime { lib, stdenv, fetchurl, libfaketime
, fonttosfnt, mkfontscale , xorg
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -10,7 +10,7 @@ stdenv.mkDerivation {
sha256 = "bda67b6bc6d5d871a4d46565d4126729dfb8a0de9611dae6c68132a7b7db1270"; sha256 = "bda67b6bc6d5d871a4d46565d4126729dfb8a0de9611dae6c68132a7b7db1270";
}; };
nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ];
unpackPhase = '' unpackPhase = ''
tar -xzf $src --strip-components=1 tar -xzf $src --strip-components=1

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, fetchFromGitHub { lib, stdenv, fetchurl, fetchFromGitHub
, mkfontscale, bdf2psf, bdftopcf , xorg, bdf2psf, bdftopcf
, fonttosfnt, libfaketime , libfaketime
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = nativeBuildInputs =
[ mkfontscale bdf2psf bdftopcf [ xorg.mkfontscale bdf2psf bdftopcf
fonttosfnt libfaketime xorg.fonttosfnt libfaketime
]; ];
buildPhase = '' buildPhase = ''

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchzip, mkfontscale }: { lib, stdenv, fetchzip, xorg }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "profont"; pname = "profont";
@ -20,7 +20,7 @@ stdenv.mkDerivation {
dontBuild = true; dontBuild = true;
nativeBuildInputs = [ mkfontscale ]; nativeBuildInputs = [ xorg.mkfontscale ];
installPhase = '' installPhase = ''
mkdir -p "$out/share/fonts/misc" mkdir -p "$out/share/fonts/misc"

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, libfaketime, fonttosfnt, mkfontscale }: { lib, stdenv, fetchFromGitHub, libfaketime, xorg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "siji-${version}"; name = "siji-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1408g4nxwdd682vjqpmgv0cp0bfnzzzwls62cjs9zrds16xa9dpf"; sha256 = "1408g4nxwdd682vjqpmgv0cp0bfnzzzwls62cjs9zrds16xa9dpf";
}; };
nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ];
buildPhase = '' buildPhase = ''
# compress pcf fonts # compress pcf fonts

View file

@ -1,4 +1,4 @@
{ lib, fetchurl, mkfontscale }: { lib, fetchurl, xorg }:
let let
pname = "spleen"; pname = "spleen";
@ -17,7 +17,7 @@ in fetchurl {
install -m644 fonts.alias-spleen $d/fonts.alias install -m644 fonts.alias-spleen $d/fonts.alias
# create fonts.dir so NixOS xorg module adds to fp # create fonts.dir so NixOS xorg module adds to fp
${mkfontscale}/bin/mkfontdir "$d" ${xorg.mkfontscale}/bin/mkfontdir "$d"
''; '';
sha256 = "sha256-6Imsa0ku8On63di0DOo0QxBa0t+tbtPRxM531EIiG94="; sha256 = "sha256-6Imsa0ku8On63di0DOo0QxBa0t+tbtPRxM531EIiG94=";

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fontforge, mkfontscale }: { lib, stdenv, fetchurl, fontforge, xorg }:
let let
version = "1.11"; version = "1.11";
@ -11,7 +11,7 @@ in stdenv.mkDerivation {
sha256 = "0kpjzdj8sv5871b8827mjgj9dswk75h94jj5iia2bds18ih1pglp"; sha256 = "0kpjzdj8sv5871b8827mjgj9dswk75h94jj5iia2bds18ih1pglp";
}; };
nativeBuildInputs = [ fontforge mkfontscale ]; nativeBuildInputs = [ fontforge xorg.mkfontscale ];
unpackPhase = '' unpackPhase = ''
tar -xzf $src --strip-components=1 tar -xzf $src --strip-components=1

View file

@ -1,4 +1,4 @@
{ fetchFromGitHub, mkfontscale, lib, stdenv }: { fetchFromGitHub, xorg, lib, stdenv }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tamzen-font"; pname = "tamzen-font";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "00x5fipzqimglvshhqwycdhaqslbvn3rl06jnswhyxfvz16ymj7s"; sha256 = "00x5fipzqimglvshhqwycdhaqslbvn3rl06jnswhyxfvz16ymj7s";
}; };
nativeBuildInputs = [ mkfontscale ]; nativeBuildInputs = [ xorg.mkfontscale ];
installPhase = '' installPhase = ''
install -m 644 -D otb/*.otb pcf/*.pcf -t "$out/share/fonts/misc" install -m 644 -D otb/*.otb pcf/*.pcf -t "$out/share/fonts/misc"

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, python3 { lib, stdenv, fetchurl, python3
, bdftopcf, mkfontscale , bdftopcf, xorg
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
patches = [ ./SOURCE_DATE_EPOCH-for-otb.patch ]; patches = [ ./SOURCE_DATE_EPOCH-for-otb.patch ];
nativeBuildInputs = nativeBuildInputs =
[ python3 bdftopcf mkfontscale ]; [ python3 bdftopcf xorg.mkfontscale ];
enableParallelBuilding = true; enableParallelBuilding = true;

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, python3 { lib, stdenv, fetchFromGitHub, python3
, bdftopcf, mkfontscale , bdftopcf, xorg
, libfaketime, fonttosfnt , libfaketime,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = nativeBuildInputs =
[ python3 bdftopcf mkfontscale [ python3 bdftopcf xorg.mkfontscale
libfaketime fonttosfnt libfaketime xorg.fonttosfnt
]; ];
postPatch = '' postPatch = ''

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, bdftopcf { lib, stdenv, fetchurl, bdftopcf
, libfaketime, fonttosfnt, mkfontscale , libfaketime, xorg
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -24,8 +24,8 @@ stdenv.mkDerivation {
sourceRoot = "."; sourceRoot = ".";
nativeBuildInputs = nativeBuildInputs =
[ bdftopcf libfaketime fonttosfnt [ bdftopcf libfaketime xorg.fonttosfnt
mkfontscale xorg.mkfontscale
]; ];
buildPhase = '' buildPhase = ''

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, perl, kbd, bdftopcf { lib, stdenv, fetchurl, perl, kbd, bdftopcf
, libfaketime, fonttosfnt, mkfontscale , libfaketime, xorg
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -12,7 +12,7 @@ stdenv.mkDerivation {
nativeBuildInputs = nativeBuildInputs =
[ bdftopcf libfaketime [ bdftopcf libfaketime
fonttosfnt mkfontscale xorg.fonttosfnt xorg.mkfontscale
] ++ lib.optionals stdenv.isLinux [ perl kbd ]; ] ++ lib.optionals stdenv.isLinux [ perl kbd ];
postPatch = "patchShebangs ."; postPatch = "patchShebangs .";

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, mkfontscale { lib, stdenv, fetchurl, xorg
, libfaketime, fonttosfnt , libfaketime
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
hash = "sha256-77rkcU0YajAVugWHnGscaFvcFTgWm+1WPLknQZvTjN0="; hash = "sha256-77rkcU0YajAVugWHnGscaFvcFTgWm+1WPLknQZvTjN0=";
}; };
nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ];
dontUnpack = true; dontUnpack = true;

View file

@ -1,6 +1,5 @@
{ lib, stdenv, fetchurl, perl { lib, stdenv, fetchurl, perl
, bdftopcf, bdf2psf, mkfontdir , bdftopcf, bdf2psf, xorg
, fonttosfnt
, targetsDat ? null , targetsDat ? null
, variantsDat ? null , variantsDat ? null
}: }:
@ -17,7 +16,7 @@ stdenv.mkDerivation rec {
# remove for version >1.3 # remove for version >1.3
patches = [ ./determinism.patch ]; patches = [ ./determinism.patch ];
nativeBuildInputs = [ perl bdftopcf bdf2psf fonttosfnt mkfontdir ]; nativeBuildInputs = [ perl bdftopcf bdf2psf xorg.fonttosfnt xorg.mkfontdir ];
# configure sizes, encodings and variants # configure sizes, encodings and variants
preConfigure = preConfigure =

View file

@ -10,10 +10,7 @@
, gobject-introspection , gobject-introspection
, grail , grail
, gtk3 , gtk3
, libX11 , xorg
, libXext
, libXi
, libXtst
, pango , pango
, xorgserver , xorgserver
}: }:
@ -38,7 +35,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config wrapGAppsHook python3Packages.wrapPython]; nativeBuildInputs = [ pkg-config wrapGAppsHook python3Packages.wrapPython];
buildInputs = [ atk dbus evemu frame gdk-pixbuf gobject-introspection grail buildInputs = [ atk dbus evemu frame gdk-pixbuf gobject-introspection grail
gtk3 libX11 libXext libXi libXtst pango python3Packages.python xorgserver gtk3 xorg.libX11 xorg.libXext xorg.libXi xorg.libXtst pango python3Packages.python xorgserver
]; ];
patchPhase = '' patchPhase = ''

View file

@ -3,8 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, autoreconfHook , autoreconfHook
, imlib2 , imlib2
, libX11 , xorg
, libXext
, ncurses , ncurses
, pkg-config , pkg-config
, zlib , zlib
@ -32,8 +31,8 @@ stdenv.mkDerivation rec {
zlib zlib
(imlib2.override { inherit x11Support; }) (imlib2.override { inherit x11Support; })
] ++ lib.optionals x11Support [ ] ++ lib.optionals x11Support [
libX11 xorg.libX11
libXext xorg.libXext
]; ];
outputs = [ "bin" "dev" "out" "man" ]; outputs = [ "bin" "dev" "out" "man" ];

View file

@ -6,7 +6,7 @@
, wxGTK32 , wxGTK32
, Cocoa , Cocoa
, enableXWin ? false , enableXWin ? false
, libX11 , xorg
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -22,13 +22,13 @@ stdenv.mkDerivation rec {
buildInputs = lib.optional enableWX wxGTK32 buildInputs = lib.optional enableWX wxGTK32
++ lib.optional (enableWX && stdenv.isDarwin) Cocoa ++ lib.optional (enableWX && stdenv.isDarwin) Cocoa
++ lib.optional enableXWin libX11; ++ lib.optional enableXWin xorg.libX11;
passthru = { passthru = {
inherit (xorg) libX11;
inherit inherit
enableWX enableWX
enableXWin enableXWin
libX11
; ;
}; };

View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland-scanner { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland-scanner
, libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman , libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman
, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa , libcap, mesa, xorg
, libpng, ffmpeg_4, xcbutilrenderutil, seatd , libpng, ffmpeg_4, seatd
, enableXWayland ? true, xwayland ? null , enableXWayland ? true, xwayland ? null
}: }:
@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
libGL wayland wayland-protocols libinput libxkbcommon pixman libGL wayland wayland-protocols libinput libxkbcommon pixman
xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa xorg.xcbutilwm xorg.libX11 libcap xorg.xcbutilimage xorg.xcbutilerrors mesa
libpng ffmpeg_4 xcbutilrenderutil seatd libpng ffmpeg_4 xorg.xcbutilrenderutil seatd
] ]
++ lib.optional enableXWayland xwayland ++ lib.optional enableXWayland xwayland
; ;

View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, wayland-scanner { lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, wayland-scanner
, libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman , libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman
, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa ,libcap, mesa, xorg
, libpng, ffmpeg_4, xcbutilrenderutil, seatd, vulkan-loader, glslang , libpng, ffmpeg_4, seatd, vulkan-loader, glslang
, nixosTests , nixosTests
, enableXWayland ? true, xwayland ? null , enableXWayland ? true, xwayland ? null
@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
libGL wayland wayland-protocols libinput libxkbcommon pixman libGL wayland wayland-protocols libinput libxkbcommon pixman
xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa xorg.xcbutilwm xorg.libX11 libcap xorg.xcbutilimage xorg.xcbutilerrors mesa
libpng ffmpeg_4 xcbutilrenderutil seatd vulkan-loader libpng ffmpeg_4 xorg.xcbutilrenderutil seatd vulkan-loader
] ]
++ lib.optional enableXWayland xwayland ++ lib.optional enableXWayland xwayland
; ;

View file

@ -1,4 +1,4 @@
{ stdenvNoCC, lndir, newlib, msp430GccSupport }: { stdenvNoCC, xorg, newlib, msp430GccSupport }:
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
name = "msp430-${newlib.name}"; name = "msp430-${newlib.name}";
@ -10,9 +10,9 @@ stdenvNoCC.mkDerivation {
buildCommand = '' buildCommand = ''
mkdir $out mkdir $out
${lndir}/bin/lndir -silent $newlib $out ${xorg.lndir}/bin/lndir -silent $newlib $out
${lndir}/bin/lndir -silent $msp430GccSupport/include $out/${newlib.incdir} ${xorg.lndir}/bin/lndir -silent $msp430GccSupport/include $out/${newlib.incdir}
${lndir}/bin/lndir -silent $msp430GccSupport/lib $out/${newlib.libdir} ${xorg.lndir}/bin/lndir -silent $msp430GccSupport/lib $out/${newlib.libdir}
''; '';
passthru = { passthru = {

View file

@ -6,11 +6,7 @@
, cmake , cmake
, fontconfig , fontconfig
, libGL , libGL
, libxcb , xorg
, libX11
, libXcursor
, libXi
, libXrandr
, libxkbcommon , libxkbcommon
, wayland , wayland
# Darwin Frameworks # Darwin Frameworks
@ -24,7 +20,7 @@
}: }:
let let
rpathLibs = [ fontconfig libGL libxcb libX11 libXcursor libXrandr libXi ] rpathLibs = [ fontconfig libGL xorg.libxcb xorg.libX11 xorg.libXcursor xorg.libXrandr xorg.libXi ]
++ lib.optionals stdenv.isLinux [ libxkbcommon wayland ]; ++ lib.optionals stdenv.isLinux [ libxkbcommon wayland ];
in in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -39,7 +35,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-9zbA9JXfLdosCU6gVsrsAyiyX8Qh6x5wMw1W4QKqbp4="; cargoSha256 = "sha256-9zbA9JXfLdosCU6gVsrsAyiyX8Qh6x5wMw1W4QKqbp4=";
nativeBuildInputs = [ cmake pkg-config fontconfig ]; nativeBuildInputs = [ cmake pkg-config fontconfig ];
buildInputs = rpathLibs ++ [ libxcb.dev ] buildInputs = rpathLibs ++ [ xorg.libxcb.dev ]
++ lib.optionals stdenv.isDarwin [ ++ lib.optionals stdenv.isDarwin [
AppKit AppKit
CoreGraphics CoreGraphics

View file

@ -8,11 +8,7 @@
, stdenv , stdenv
, fontconfig , fontconfig
, libGL , libGL
, libX11 , xorg
, libXcursor
, libXi
, libXrandr
, libxcb
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -33,11 +29,11 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [
fontconfig fontconfig
libGL libGL
libX11 xorg.libX11
libXcursor xorg.libXcursor
libXi xorg.libXi
libXrandr xorg.libXrandr
libxcb xorg.libxcb
]; ];
postInstall = lib.optionalString stdenv.isLinux '' postInstall = lib.optionalString stdenv.isLinux ''

View file

@ -5,8 +5,7 @@
, pkg-config , pkg-config
, alsa-lib , alsa-lib
, libGL , libGL
, libX11 , xorg
, libXi
, udev , udev
, Cocoa , Cocoa
, OpenGL , OpenGL
@ -32,8 +31,8 @@ rustPlatform.buildRustPackage rec {
buildInputs = lib.optionals stdenv.isLinux [ buildInputs = lib.optionals stdenv.isLinux [
alsa-lib alsa-lib
libGL libGL
libX11 xorg.libX11
libXi xorg.libXi
udev udev
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
Cocoa Cocoa

View file

@ -14,9 +14,7 @@
, gnused , gnused
, imagemagick , imagemagick
, procps , procps
, xdpyinfo , xorg
, xrandr
, xset
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -38,7 +36,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin mkdir -p $out/bin
cp betterlockscreen $out/bin/betterlockscreen cp betterlockscreen $out/bin/betterlockscreen
wrapProgram "$out/bin/betterlockscreen" \ wrapProgram "$out/bin/betterlockscreen" \
--prefix PATH : "$out/bin:${lib.makeBinPath [ bc coreutils dbus dunst i3lock-color gawk gnugrep gnused imagemagick procps xdpyinfo xrandr xset ]}" --prefix PATH : "$out/bin:${lib.makeBinPath [ bc coreutils dbus dunst i3lock-color gawk gnugrep gnused imagemagick procps xorg.xdpyinfo xorg.xrandr xorg.xset ]}"
runHook postInstall runHook postInstall
''; '';

View file

@ -3,8 +3,7 @@
, coreutils , coreutils
, fetchFromGitHub , fetchFromGitHub
, resholve , resholve
, xauth , xorg
, xorgserver
}: }:
resholve.mkDerivation rec { resholve.mkDerivation rec {
@ -26,11 +25,11 @@ resholve.mkDerivation rec {
interpreter = "${bash}/bin/sh"; interpreter = "${bash}/bin/sh";
inputs = [ inputs = [
coreutils coreutils
xauth xorg.xauth
xorgserver xorg.xorgserver
]; ];
execer = [ execer = [
"cannot:${xorgserver}/bin/Xorg" "cannot:${xorg.xorgserver}/bin/Xorg"
]; ];
}; };
}; };

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config { lib, stdenv, fetchFromGitHub, cmake, pkg-config
, gtk, glib, pcre, libappindicator, libpthreadstubs, libXdmcp , gtk, glib, pcre, libappindicator, libpthreadstubs, xorg
, libxkbcommon, libepoxy, at-spi2-core, dbus, libdbusmenu , libxkbcommon, libepoxy, at-spi2-core, dbus, libdbusmenu
, wrapGAppsHook , wrapGAppsHook
}: }:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ];
buildInputs = [ buildInputs = [
gtk glib pcre libappindicator libpthreadstubs gtk glib pcre libappindicator libpthreadstubs
libXdmcp libxkbcommon libepoxy at-spi2-core xorg.libXdmcp libxkbcommon libepoxy at-spi2-core
dbus libdbusmenu dbus libdbusmenu
]; ];

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, libXaw, freetype }: { lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, xorg, freetype }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libotf"; pname = "libotf";
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config autoreconfHook ]; nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [ libXaw freetype ]; buildInputs = [ xorg.libXaw freetype ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

View file

@ -9,7 +9,7 @@
, oniguruma , oniguruma
, libiconv , libiconv
, Security , Security
, libxcb , xorg
, zlib , zlib
}: }:
@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
pkg-config pkg-config
]; ];
buildInputs = [ libgit2 oniguruma libxcb ] ++ lib.optionals stdenv.isDarwin [ buildInputs = [ libgit2 oniguruma xorg.libxcb ] ++ lib.optionals stdenv.isDarwin [
libiconv libiconv
Security Security
zlib zlib

View file

@ -1,7 +1,7 @@
{ appimageTools { appimageTools
, fetchurl , fetchurl
, lib , lib
, libxkbfile , xorg
, udev , udev
, wooting-udev-rules , wooting-udev-rules
}: }:
@ -26,7 +26,7 @@ appimageTools.wrapType2 rec {
pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ ([ pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ ([
udev udev
wooting-udev-rules wooting-udev-rules
libxkbfile xorg.libxkbfile
]); ]);
extraInstallCommands = "mv $out/bin/{${name},${pname}}"; extraInstallCommands = "mv $out/bin/{${name},${pname}}";

View file

@ -1562,9 +1562,7 @@ with pkgs;
libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { }; libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { };
maiko = callPackage ../applications/emulators/maiko { maiko = callPackage ../applications/emulators/maiko { };
inherit (xorg) libX11;
};
mame = libsForQt514.callPackage ../applications/emulators/mame { mame = libsForQt514.callPackage ../applications/emulators/mame {
inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback; inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback;
@ -1827,7 +1825,6 @@ with pkgs;
### APPLICATIONS/TERMINAL-EMULATORS ### APPLICATIONS/TERMINAL-EMULATORS
alacritty = callPackage ../applications/terminal-emulators/alacritty { alacritty = callPackage ../applications/terminal-emulators/alacritty {
inherit (xorg) libXcursor libXxf86vm libXi;
inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL;
}; };
@ -3196,7 +3193,6 @@ with pkgs;
broot = callPackage ../tools/misc/broot { broot = callPackage ../tools/misc/broot {
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
inherit (xorg) libxcb;
}; };
bruteforce-luks = callPackage ../tools/security/bruteforce-luks { }; bruteforce-luks = callPackage ../tools/security/bruteforce-luks { };
@ -4503,9 +4499,7 @@ with pkgs;
morsel = callPackage ../tools/text/morsel {}; morsel = callPackage ../tools/text/morsel {};
mousetweaks = callPackage ../applications/accessibility/mousetweaks { mousetweaks = callPackage ../applications/accessibility/mousetweaks { };
inherit (xorg) libX11 libXtst libXfixes;
};
mp3blaster = callPackage ../applications/audio/mp3blaster { }; mp3blaster = callPackage ../applications/audio/mp3blaster { };
@ -5358,9 +5352,7 @@ with pkgs;
m17n_lib = callPackage ../tools/inputmethods/m17n-lib { }; m17n_lib = callPackage ../tools/inputmethods/m17n-lib { };
libotf = callPackage ../tools/inputmethods/m17n-lib/otf.nix { libotf = callPackage ../tools/inputmethods/m17n-lib/otf.nix { };
inherit (xorg) libXaw;
};
netbird = callPackage ../tools/networking/netbird { netbird = callPackage ../tools/networking/netbird {
inherit (darwin.apple_sdk_11_0.frameworks) Cocoa IOKit Kernel UserNotifications WebKit; inherit (darwin.apple_sdk_11_0.frameworks) Cocoa IOKit Kernel UserNotifications WebKit;
@ -7369,7 +7361,6 @@ with pkgs;
gromit-mpx = callPackage ../tools/graphics/gromit-mpx { gromit-mpx = callPackage ../tools/graphics/gromit-mpx {
gtk = gtk3; gtk = gtk3;
libappindicator = libappindicator-gtk3; libappindicator = libappindicator-gtk3;
inherit (xorg) libXdmcp;
}; };
gron = callPackage ../development/tools/gron { }; gron = callPackage ../development/tools/gron { };
@ -7527,7 +7518,6 @@ with pkgs;
pixz = callPackage ../tools/compression/pixz { }; pixz = callPackage ../tools/compression/pixz { };
plplot = callPackage ../development/libraries/plplot { plplot = callPackage ../development/libraries/plplot {
inherit (xorg) libX11;
inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.apple_sdk.frameworks) Cocoa;
}; };
@ -11665,9 +11655,7 @@ with pkgs;
squeekboard = callPackage ../applications/accessibility/squeekboard { }; squeekboard = callPackage ../applications/accessibility/squeekboard { };
sx = callPackage ../tools/X11/sx { sx = callPackage ../tools/X11/sx { };
inherit (xorg) xauth xorgserver;
};
systemdgenie = libsForQt5.callPackage ../applications/system/systemdgenie { }; systemdgenie = libsForQt5.callPackage ../applications/system/systemdgenie { };
@ -12024,9 +12012,7 @@ with pkgs;
trdl-client = callPackage ../tools/misc/trdl-client { }; trdl-client = callPackage ../tools/misc/trdl-client { };
trenchbroom = libsForQt5.callPackage ../applications/misc/trenchbroom { trenchbroom = libsForQt5.callPackage ../applications/misc/trenchbroom { };
inherit (xorg) libXxf86vm;
};
trickle = callPackage ../tools/networking/trickle {}; trickle = callPackage ../tools/networking/trickle {};
@ -12452,9 +12438,7 @@ with pkgs;
woof = callPackage ../tools/misc/woof { }; woof = callPackage ../tools/misc/woof { };
wootility = callPackage ../tools/misc/wootility { wootility = callPackage ../tools/misc/wootility { };
inherit (xorg) libxkbfile;
};
wormhole-william = callPackage ../tools/networking/wormhole-william { }; wormhole-william = callPackage ../tools/networking/wormhole-william { };
@ -14903,7 +14887,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration;
}; };
cargo-ui = callPackage ../development/tools/rust/cargo-ui { cargo-ui = callPackage ../development/tools/rust/cargo-ui {
inherit (xorg) libX11 libXcursor libXi libXrandr libxcb;
inherit (darwin.apple_sdk.frameworks); inherit (darwin.apple_sdk.frameworks);
}; };
@ -15892,7 +15875,6 @@ with pkgs;
msp430Newlib = callPackage ../development/misc/msp430/newlib.nix { }; msp430Newlib = callPackage ../development/misc/msp430/newlib.nix { };
msp430NewlibCross = callPackage ../development/misc/msp430/newlib.nix { msp430NewlibCross = callPackage ../development/misc/msp430/newlib.nix {
inherit (buildPackages.xorg) lndir;
newlib = newlibCross; newlib = newlibCross;
}; };
@ -16755,9 +16737,7 @@ with pkgs;
flexcpp = callPackage ../development/tools/parsing/flexc++ { }; flexcpp = callPackage ../development/tools/parsing/flexc++ { };
geis = callPackage ../development/libraries/geis { geis = callPackage ../development/libraries/geis { };
inherit (xorg) libX11 libXext libXi libXtst;
};
gi-docgen = callPackage ../development/tools/documentation/gi-docgen { }; gi-docgen = callPackage ../development/tools/documentation/gi-docgen { };
@ -17476,7 +17456,6 @@ with pkgs;
slimerjs = callPackage ../development/tools/slimerjs {}; slimerjs = callPackage ../development/tools/slimerjs {};
slint-lsp = callPackage ../development/tools/misc/slint-lsp { slint-lsp = callPackage ../development/tools/misc/slint-lsp {
inherit (xorg) libXcursor libXi;
inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL;
}; };
@ -19613,9 +19592,7 @@ with pkgs;
libbytesize = callPackage ../development/libraries/libbytesize { }; libbytesize = callPackage ../development/libraries/libbytesize { };
libcaca = callPackage ../development/libraries/libcaca { libcaca = callPackage ../development/libraries/libcaca { };
inherit (xorg) libX11 libXext;
};
libcacard = callPackage ../development/libraries/libcacard { }; libcacard = callPackage ../development/libraries/libcacard { };
@ -25792,7 +25769,7 @@ with pkgs;
changie = callPackage ../development/tools/changie { }; changie = callPackage ../development/tools/changie { };
cherry = callPackage ../data/fonts/cherry { inherit (xorg) fonttosfnt mkfontdir; }; cherry = callPackage ../data/fonts/cherry { };
chonburi-font = callPackage ../data/fonts/chonburi { }; chonburi-font = callPackage ../data/fonts/chonburi { };
@ -25826,13 +25803,11 @@ with pkgs;
culmus = callPackage ../data/fonts/culmus { }; culmus = callPackage ../data/fonts/culmus { };
clearlyU = callPackage ../data/fonts/clearlyU clearlyU = callPackage ../data/fonts/clearlyU { };
{ inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
cm_unicode = callPackage ../data/fonts/cm-unicode {}; cm_unicode = callPackage ../data/fonts/cm-unicode {};
creep = callPackage ../data/fonts/creep creep = callPackage ../data/fonts/creep { };
{ inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
crimson = callPackage ../data/fonts/crimson {}; crimson = callPackage ../data/fonts/crimson {};
@ -25844,8 +25819,7 @@ with pkgs;
paths = [ dejavu_fonts.out ]; paths = [ dejavu_fonts.out ];
}; };
dina-font = callPackage ../data/fonts/dina dina-font = callPackage ../data/fonts/dina { };
{ inherit (buildPackages.xorg) mkfontscale; };
dns-root-data = callPackage ../data/misc/dns-root-data { }; dns-root-data = callPackage ../data/misc/dns-root-data { };
@ -25943,8 +25917,7 @@ with pkgs;
encode-sans = callPackage ../data/fonts/encode-sans { }; encode-sans = callPackage ../data/fonts/encode-sans { };
envypn-font = callPackage ../data/fonts/envypn-font envypn-font = callPackage ../data/fonts/envypn-font { };
{ inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
execline-man-pages = skawarePackages.execline-man-pages; execline-man-pages = skawarePackages.execline-man-pages;
@ -25990,8 +25963,7 @@ with pkgs;
geolite-legacy = callPackage ../data/misc/geolite-legacy { }; geolite-legacy = callPackage ../data/misc/geolite-legacy { };
gohufont = callPackage ../data/fonts/gohufont gohufont = callPackage ../data/fonts/gohufont { };
{ inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
gnome-user-docs = callPackage ../data/documentation/gnome-user-docs { }; gnome-user-docs = callPackage ../data/documentation/gnome-user-docs { };
@ -26435,8 +26407,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
}; };
profont = callPackage ../data/fonts/profont profont = callPackage ../data/fonts/profont { };
{ inherit (buildPackages.xorg) mkfontscale; };
proggyfonts = callPackage ../data/fonts/proggyfonts { }; proggyfonts = callPackage ../data/fonts/proggyfonts { };
@ -26586,8 +26557,7 @@ with pkgs;
scientifica = callPackage ../data/fonts/scientifica { }; scientifica = callPackage ../data/fonts/scientifica { };
siji = callPackage ../data/fonts/siji siji = callPackage ../data/fonts/siji { };
{ inherit (buildPackages.xorg) mkfontscale fonttosfnt; };
sound-theme-freedesktop = callPackage ../data/misc/sound-theme-freedesktop { }; sound-theme-freedesktop = callPackage ../data/misc/sound-theme-freedesktop { };
@ -26606,7 +26576,7 @@ with pkgs;
source-han-serif = sourceHanPackages.serif; source-han-serif = sourceHanPackages.serif;
source-han-mono = sourceHanPackages.mono; source-han-mono = sourceHanPackages.mono;
spleen = callPackage ../data/fonts/spleen { inherit (buildPackages.xorg) mkfontscale; }; spleen = callPackage ../data/fonts/spleen { };
stilo-themes = callPackage ../data/themes/stilo { }; stilo-themes = callPackage ../data/themes/stilo { };
@ -26618,9 +26588,9 @@ with pkgs;
taskspooler = callPackage ../tools/system/taskspooler { }; taskspooler = callPackage ../tools/system/taskspooler { };
tamsyn = callPackage ../data/fonts/tamsyn { inherit (buildPackages.xorg) mkfontscale; }; tamsyn = callPackage ../data/fonts/tamsyn { };
tamzen = callPackage ../data/fonts/tamzen { inherit (buildPackages.xorg) mkfontscale; }; tamzen = callPackage ../data/fonts/tamzen { };
tango-icon-theme = callPackage ../data/icons/tango-icon-theme { tango-icon-theme = callPackage ../data/icons/tango-icon-theme {
gtk = res.gtk2; gtk = res.gtk2;
@ -26644,8 +26614,7 @@ with pkgs;
tenderness = callPackage ../data/fonts/tenderness { }; tenderness = callPackage ../data/fonts/tenderness { };
terminus_font = callPackage ../data/fonts/terminus-font terminus_font = callPackage ../data/fonts/terminus-font { };
{ inherit (buildPackages.xorg) mkfontscale; };
terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { }; terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { };
@ -26681,8 +26650,7 @@ with pkgs;
ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { }; ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { };
ucs-fonts = callPackage ../data/fonts/ucs-fonts ucs-fonts = callPackage ../data/fonts/ucs-fonts { };
{ inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
bront_fonts = callPackage ../data/fonts/bront { }; bront_fonts = callPackage ../data/fonts/bront { };
@ -26694,8 +26662,7 @@ with pkgs;
unfonts-core = callPackage ../data/fonts/unfonts-core { }; unfonts-core = callPackage ../data/fonts/unfonts-core { };
uni-vga = callPackage ../data/fonts/uni-vga uni-vga = callPackage ../data/fonts/uni-vga { };
{ inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
unicode-character-database = callPackage ../data/misc/unicode-character-database { }; unicode-character-database = callPackage ../data/misc/unicode-character-database { };
@ -26703,14 +26670,13 @@ with pkgs;
unihan-database = callPackage ../data/misc/unihan-database { }; unihan-database = callPackage ../data/misc/unihan-database { };
unifont = callPackage ../data/fonts/unifont unifont = callPackage ../data/fonts/unifont { };
{ inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
unifont_upper = callPackage ../data/fonts/unifont_upper { }; unifont_upper = callPackage ../data/fonts/unifont_upper { };
unscii = callPackage ../data/fonts/unscii { }; unscii = callPackage ../data/fonts/unscii { };
uw-ttyp0 = callPackage ../data/fonts/uw-ttyp0 { inherit (xorg) fonttosfnt mkfontdir; }; uw-ttyp0 = callPackage ../data/fonts/uw-ttyp0 { };
u001-font = callPackage ../data/fonts/u001 { }; u001-font = callPackage ../data/fonts/u001 { };
@ -27382,9 +27348,7 @@ with pkgs;
ciscoPacketTracer8 = callPackage ../applications/networking/cisco-packet-tracer/8.nix { }; ciscoPacketTracer8 = callPackage ../applications/networking/cisco-packet-tracer/8.nix { };
claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { };
inherit (xorg) libSM;
};
cligh = python3Packages.callPackage ../development/tools/github/cligh {}; cligh = python3Packages.callPackage ../development/tools/github/cligh {};
@ -27846,7 +27810,6 @@ with pkgs;
epick = callPackage ../applications/graphics/epick { epick = callPackage ../applications/graphics/epick {
inherit (darwin.apple_sdk.frameworks) AppKit IOKit; inherit (darwin.apple_sdk.frameworks) AppKit IOKit;
inherit (xorg) libX11 libXcursor libXi libXrandr libxcb;
}; };
epr = callPackage ../applications/misc/epr { }; epr = callPackage ../applications/misc/epr { };
@ -29008,12 +28971,8 @@ with pkgs;
}; };
wlroots = wlroots_0_15; wlroots = wlroots_0_15;
wlroots_0_14 = callPackage ../development/libraries/wlroots/0.14.nix { wlroots_0_14 = callPackage ../development/libraries/wlroots/0.14.nix { };
inherit (xorg) xcbutilrenderutil; wlroots_0_15 = callPackage ../development/libraries/wlroots/0.15.nix { };
};
wlroots_0_15 = callPackage ../development/libraries/wlroots/0.15.nix {
inherit (xorg) xcbutilrenderutil;
};
sway-unwrapped = callPackage ../applications/window-managers/sway { }; sway-unwrapped = callPackage ../applications/window-managers/sway { };
sway = callPackage ../applications/window-managers/sway/wrapper.nix { }; sway = callPackage ../applications/window-managers/sway/wrapper.nix { };
@ -29036,9 +28995,7 @@ with pkgs;
tiramisu = callPackage ../applications/misc/tiramisu { }; tiramisu = callPackage ../applications/misc/tiramisu { };
rlaunch = callPackage ../applications/misc/rlaunch { rlaunch = callPackage ../applications/misc/rlaunch { };
inherit (xorg) libX11 libXft libXinerama;
};
rootbar = callPackage ../applications/misc/rootbar {}; rootbar = callPackage ../applications/misc/rootbar {};
@ -29098,9 +29055,7 @@ with pkgs;
i3lock-pixeled = callPackage ../misc/screensavers/i3lock-pixeled { }; i3lock-pixeled = callPackage ../misc/screensavers/i3lock-pixeled { };
betterlockscreen = callPackage ../misc/screensavers/betterlockscreen { betterlockscreen = callPackage ../misc/screensavers/betterlockscreen { };
inherit (xorg) xdpyinfo xrandr xset;
};
multilockscreen = callPackage ../misc/screensavers/multilockscreen { }; multilockscreen = callPackage ../misc/screensavers/multilockscreen { };
@ -29260,7 +29215,6 @@ with pkgs;
inkscape-extensions = recurseIntoAttrs (callPackages ../applications/graphics/inkscape/extensions.nix {}); inkscape-extensions = recurseIntoAttrs (callPackages ../applications/graphics/inkscape/extensions.nix {});
inlyne = callPackage ../applications/misc/inlyne { inlyne = callPackage ../applications/misc/inlyne {
inherit (xorg) libX11 libXcursor libXi libXrandr libxcb;
inherit (darwin) libobjc; inherit (darwin) libobjc;
inherit (darwin.apple_sdk.frameworks) AppKit ApplicationServices CoreFoundation CoreGraphics CoreServices CoreText CoreVideo Foundation Metal QuartzCore Security; inherit (darwin.apple_sdk.frameworks) AppKit ApplicationServices CoreFoundation CoreGraphics CoreServices CoreText CoreVideo Foundation Metal QuartzCore Security;
}; };
@ -29947,7 +29901,6 @@ with pkgs;
menumaker = callPackage ../applications/misc/menumaker { }; menumaker = callPackage ../applications/misc/menumaker { };
menyoki = callPackage ../applications/graphics/menyoki { menyoki = callPackage ../applications/graphics/menyoki {
inherit (xorg) libX11 libXrandr;
inherit (darwin.apple_sdk.frameworks) AppKit; inherit (darwin.apple_sdk.frameworks) AppKit;
}; };
@ -31592,9 +31545,7 @@ with pkgs;
lightdm_qt = lightdm.override { withQt5 = true; }; lightdm_qt = lightdm.override { withQt5 = true; };
lightdm-enso-os-greeter = callPackage ../applications/display-managers/lightdm-enso-os-greeter { lightdm-enso-os-greeter = callPackage ../applications/display-managers/lightdm-enso-os-greeter { };
inherit (xorg) libX11 libXdmcp libpthreadstubs;
};
lightdm-gtk-greeter = callPackage ../applications/display-managers/lightdm/gtk-greeter.nix { lightdm-gtk-greeter = callPackage ../applications/display-managers/lightdm/gtk-greeter.nix {
inherit (xfce) xfce4-dev-tools; inherit (xfce) xfce4-dev-tools;
@ -32695,7 +32646,6 @@ with pkgs;
xastir = callPackage ../applications/misc/xastir { xastir = callPackage ../applications/misc/xastir {
rastermagick = imagemagick6; rastermagick = imagemagick6;
inherit (xorg) libXt;
}; };
xautomation = callPackage ../tools/X11/xautomation { }; xautomation = callPackage ../tools/X11/xautomation { };
@ -33777,7 +33727,6 @@ with pkgs;
fish-fillets-ng = callPackage ../games/fish-fillets-ng { }; fish-fillets-ng = callPackage ../games/fish-fillets-ng { };
jumpy = callPackage ../games/jumpy { jumpy = callPackage ../games/jumpy {
inherit (xorg) libX11 libXi;
inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
}; };
@ -36945,8 +36894,7 @@ with pkgs;
tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; }; tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };
tewi-font = callPackage ../data/fonts/tewi tewi-font = callPackage ../data/fonts/tewi { };
{ inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
texFunctions = callPackage ../tools/typesetting/tex/nix pkgs; texFunctions = callPackage ../tools/typesetting/tex/nix pkgs;