From f0de96be2c6bf7d2662490265902be58ba1f9491 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Thu, 5 Feb 2026 23:47:59 +0100 Subject: [PATCH] various: rename references from libXpm to libxpm this shouldn't create any rebuilds --- pkgs/applications/audio/rakarrack/default.nix | 4 ++-- pkgs/applications/audio/zynaddsubfx/default.nix | 6 +++--- pkgs/applications/editors/emacs/make-emacs.nix | 6 +++--- pkgs/applications/editors/vim/full.nix | 4 ++-- pkgs/applications/window-managers/jwm/default.nix | 4 ++-- .../window-managers/jwm/jwm-settings-manager.nix | 4 ++-- pkgs/by-name/ac/ace-of-penguins/package.nix | 4 ++-- pkgs/by-name/al/alliance/package.nix | 4 ++-- pkgs/by-name/bo/bochs/package.nix | 4 ++-- pkgs/by-name/cd/cdesktopenv/package.nix | 4 ++-- pkgs/by-name/dz/dzen2/package.nix | 4 ++-- pkgs/by-name/fb/fbida/package.nix | 4 ++-- pkgs/by-name/fb/fbpanel/package.nix | 4 ++-- pkgs/by-name/fl/fluxbox/package.nix | 4 ++-- pkgs/by-name/fr/fricas/package.nix | 4 ++-- pkgs/by-name/ft/fte/package.nix | 4 ++-- pkgs/by-name/fv/fvwm2/package.nix | 4 ++-- pkgs/by-name/fv/fvwm3/package.nix | 4 ++-- pkgs/by-name/gd/gd/package.nix | 4 ++-- pkgs/by-name/ge/geant4/package.nix | 4 ++-- pkgs/by-name/gi/giada/package.nix | 4 ++-- pkgs/by-name/gp/gpsd/package.nix | 4 ++-- pkgs/by-name/ha/hackedbox/package.nix | 4 ++-- pkgs/by-name/ic/icewm/package.nix | 4 ++-- pkgs/by-name/li/linux-wallpaperengine/package.nix | 4 ++-- pkgs/by-name/lx/lxpanel/package.nix | 4 ++-- pkgs/by-name/ml/mlvwm/package.nix | 4 ++-- pkgs/by-name/mu/mup/package.nix | 4 ++-- pkgs/by-name/na/nas/package.nix | 4 ++-- pkgs/by-name/ne/nedit/package.nix | 4 ++-- pkgs/by-name/ne/nethack/package.nix | 4 ++-- pkgs/by-name/ne/nexuiz/package.nix | 4 ++-- pkgs/by-name/pe/pekwm/package.nix | 4 ++-- pkgs/by-name/ra/ratpoison/package.nix | 4 ++-- pkgs/by-name/rk/rkrlv2/package.nix | 4 ++-- pkgs/by-name/rx/rxvt/package.nix | 4 ++-- pkgs/by-name/sd/SDL_image/package.nix | 4 ++-- pkgs/by-name/sh/shod/package.nix | 4 ++-- pkgs/by-name/st/stalonetray/package.nix | 4 ++-- pkgs/by-name/st/stereotool/package.nix | 4 ++-- pkgs/by-name/sv/sview/package.nix | 4 ++-- pkgs/by-name/sw/swi-prolog/package.nix | 4 ++-- pkgs/by-name/vl/vlc/package.nix | 4 ++-- pkgs/by-name/vn/vncrec/package.nix | 4 ++-- pkgs/by-name/wa/wallutils/package.nix | 4 ++-- pkgs/by-name/wi/windowmaker/dockapps/AlsaMixer-app.nix | 4 ++-- pkgs/by-name/wi/windowmaker/dockapps/cputnik.nix | 8 ++++---- pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix | 4 ++-- pkgs/by-name/wi/windowmaker/dockapps/wmCalClock.nix | 8 ++++---- pkgs/by-name/wi/windowmaker/dockapps/wmcube.nix | 8 ++++---- pkgs/by-name/wi/windowmaker/dockapps/wmsm-app.nix | 4 ++-- pkgs/by-name/wi/windowmaker/dockapps/wmsystemtray.nix | 4 ++-- pkgs/by-name/wi/windowmaker/package.nix | 4 ++-- pkgs/by-name/wm/wmfs/package.nix | 4 ++-- pkgs/by-name/x2/x2goclient/package.nix | 4 ++-- pkgs/by-name/xa/Xaw3d/package.nix | 4 ++-- pkgs/by-name/xa/xawtv/package.nix | 4 ++-- pkgs/by-name/xb/xbill/package.nix | 4 ++-- pkgs/by-name/xb/xboard/package.nix | 4 ++-- pkgs/by-name/xc/xcruiser/package.nix | 4 ++-- pkgs/by-name/xf/xfig/package.nix | 4 ++-- pkgs/by-name/xg/xgalagapp/package.nix | 4 ++-- pkgs/by-name/xk/xkbd/package.nix | 4 ++-- pkgs/by-name/xo/xosview/package.nix | 4 ++-- pkgs/by-name/xs/xschem/package.nix | 4 ++-- pkgs/by-name/xs/xsok/package.nix | 6 +++--- pkgs/by-name/xs/xsokoban/package.nix | 6 +++--- pkgs/by-name/xv/xvkbd/package.nix | 4 ++-- pkgs/by-name/xw/xwallpaper/package.nix | 4 ++-- pkgs/by-name/xw/xwayland/package.nix | 4 ++-- pkgs/by-name/xx/xxkb/package.nix | 4 ++-- pkgs/development/compilers/fbc/default.nix | 4 ++-- pkgs/development/interpreters/clisp/default.nix | 6 +++--- pkgs/development/libraries/allegro/5.nix | 4 ++-- pkgs/development/libraries/allegro/default.nix | 4 ++-- pkgs/games/xonotic/default.nix | 4 ++-- pkgs/tools/graphics/gnuplot/default.nix | 4 ++-- 77 files changed, 165 insertions(+), 165 deletions(-) diff --git a/pkgs/applications/audio/rakarrack/default.nix b/pkgs/applications/audio/rakarrack/default.nix index 5bd5f4df19c6..bcab38ff170d 100644 --- a/pkgs/applications/audio/rakarrack/default.nix +++ b/pkgs/applications/audio/rakarrack/default.nix @@ -7,7 +7,7 @@ fltk, libjack2, libxft, - libXpm, + libxpm, libjpeg, libpng, libsamplerate, @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { fltk libjack2 libxft - libXpm + libxpm libjpeg libpng libsamplerate diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 87a982ff0e61..1a76c7b2acbc 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -37,7 +37,7 @@ libGL, libjpeg, libx11, - libXpm, + libxpm, ntk, # Test dependencies @@ -116,12 +116,12 @@ stdenv.mkDerivation rec { ++ lib.optionals (guiModule == "fltk") [ fltk libjpeg - libXpm + libxpm ] ++ lib.optionals (guiModule == "ntk") [ ntk cairo - libXpm + libxpm ] ++ lib.optionals (guiModule == "zest") [ libGL diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index f3a593c9d576..2b640c990e1a 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -34,7 +34,7 @@ libxcursor, libxft, libxi, - libXpm, + libxpm, libXrandr, libgccjit, libjpeg, @@ -314,7 +314,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals withPgtk [ giflib gtk3 - libXpm + libxpm libjpeg libpng librsvg @@ -336,7 +336,7 @@ stdenv.mkDerivation (finalAttrs: { Xaw3d giflib libxaw - libXpm + libxpm libXrandr libjpeg libpng diff --git a/pkgs/applications/editors/vim/full.nix b/pkgs/applications/editors/vim/full.nix index 952af13f1c68..f42fb9b1016a 100644 --- a/pkgs/applications/editors/vim/full.nix +++ b/pkgs/applications/editors/vim/full.nix @@ -19,7 +19,7 @@ libx11, libxext, libsm, - libXpm, + libxpm, libXt, libxaw, libxau, @@ -181,7 +181,7 @@ stdenv.mkDerivation { libice libx11 libxext - libXpm + libxpm libXt libxaw libxau diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index c56d2e780e59..e1c9c32e4e30 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -15,7 +15,7 @@ libxft, libxinerama, libxmu, - libXpm, + libxpm, libjpeg, libpng, librsvg, @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { libxft libxinerama libxmu - libXpm + libxpm libjpeg libpng librsvg diff --git a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix index b240cfc8e9ef..ba57e5bae6f7 100644 --- a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix +++ b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix @@ -5,7 +5,7 @@ cmake, pkg-config, gettext, - libXpm, + libxpm, libGL, fltk, hicolor-icon-theme, @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libXpm + libxpm libGL fltk hicolor-icon-theme diff --git a/pkgs/by-name/ac/ace-of-penguins/package.nix b/pkgs/by-name/ac/ace-of-penguins/package.nix index ce0108e3e7b7..5ca4ce5b5227 100644 --- a/pkgs/by-name/ac/ace-of-penguins/package.nix +++ b/pkgs/by-name/ac/ace-of-penguins/package.nix @@ -4,7 +4,7 @@ fetchurl, copyDesktopItems, libx11, - libXpm, + libxpm, libpng, makeDesktopItem, zlib, @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libx11 - libXpm + libxpm libpng zlib ]; diff --git a/pkgs/by-name/al/alliance/package.nix b/pkgs/by-name/al/alliance/package.nix index e0d977308acd..1aff3af4788b 100644 --- a/pkgs/by-name/al/alliance/package.nix +++ b/pkgs/by-name/al/alliance/package.nix @@ -6,7 +6,7 @@ motif, libx11, libXt, - libXpm, + libxpm, bison, flex, automake, @@ -40,7 +40,7 @@ stdenv.mkDerivation { motif libx11 libXt - libXpm + libxpm bison ]; diff --git a/pkgs/by-name/bo/bochs/package.nix b/pkgs/by-name/bo/bochs/package.nix index 7ff777f0427e..6b8ff52a4150 100644 --- a/pkgs/by-name/bo/bochs/package.nix +++ b/pkgs/by-name/bo/bochs/package.nix @@ -9,7 +9,7 @@ libGL, libGLU, libx11, - libXpm, + libxpm, libtool, ncurses, pkg-config, @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { libGL libGLU libx11 - libXpm + libxpm ]; configureFlags = [ diff --git a/pkgs/by-name/cd/cdesktopenv/package.nix b/pkgs/by-name/cd/cdesktopenv/package.nix index 883a1d2aaf6b..4f14dc638690 100644 --- a/pkgs/by-name/cd/cdesktopenv/package.nix +++ b/pkgs/by-name/cd/cdesktopenv/package.nix @@ -31,7 +31,7 @@ autoreconfHook, opensp, flex, - libXpm, + libxpm, rpcsvc-proto, sessreg, pkg-config, @@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { libxaw mksh libxcrypt - libXpm + libxpm sessreg lmdb ]; diff --git a/pkgs/by-name/dz/dzen2/package.nix b/pkgs/by-name/dz/dzen2/package.nix index 24fe91d184b7..8530be3bfcef 100644 --- a/pkgs/by-name/dz/dzen2/package.nix +++ b/pkgs/by-name/dz/dzen2/package.nix @@ -6,7 +6,7 @@ libx11, libxft, libxinerama, - libXpm, + libxpm, }: stdenv.mkDerivation (finalAttrs: { @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { libx11 libxft libxinerama - libXpm + libxpm ]; src = fetchurl { diff --git a/pkgs/by-name/fb/fbida/package.nix b/pkgs/by-name/fb/fbida/package.nix index 7bb852386840..36a76bf05353 100644 --- a/pkgs/by-name/fb/fbida/package.nix +++ b/pkgs/by-name/fb/fbida/package.nix @@ -17,7 +17,7 @@ imagemagick, curl, sane-backends, - libXpm, + libxpm, libepoxy, pixman, poppler, @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { curl sane-backends libdrm - libXpm + libxpm libepoxy pixman poppler diff --git a/pkgs/by-name/fb/fbpanel/package.nix b/pkgs/by-name/fb/fbpanel/package.nix index d9bd66066453..85ab03cc543f 100644 --- a/pkgs/by-name/fb/fbpanel/package.nix +++ b/pkgs/by-name/fb/fbpanel/package.nix @@ -5,7 +5,7 @@ pkg-config, libx11, libxmu, - libXpm, + libxpm, gtk2, libpng, libjpeg, @@ -32,7 +32,7 @@ stdenv.mkDerivation { buildInputs = [ libx11 libxmu - libXpm + libxpm gtk2 libpng libjpeg diff --git a/pkgs/by-name/fl/fluxbox/package.nix b/pkgs/by-name/fl/fluxbox/package.nix index 7a732d3fc098..6f8064b2e356 100644 --- a/pkgs/by-name/fl/fluxbox/package.nix +++ b/pkgs/by-name/fl/fluxbox/package.nix @@ -7,7 +7,7 @@ fribidi, libxext, libxft, - libXpm, + libxpm, libXrandr, libXrender, xorgproto, @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { fribidi libxext libxft - libXpm + libxpm libXrandr libXrender xorgproto diff --git a/pkgs/by-name/fr/fricas/package.nix b/pkgs/by-name/fr/fricas/package.nix index ce16fc30721a..c98df5914a90 100644 --- a/pkgs/by-name/fr/fricas/package.nix +++ b/pkgs/by-name/fr/fricas/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, sbcl, libx11, - libXpm, + libxpm, libice, libsm, libXt, @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ sbcl libx11 - libXpm + libxpm libice libsm libXt diff --git a/pkgs/by-name/ft/fte/package.nix b/pkgs/by-name/ft/fte/package.nix index 9f6caa7c4100..a06e3aee5abf 100644 --- a/pkgs/by-name/ft/fte/package.nix +++ b/pkgs/by-name/ft/fte/package.nix @@ -5,7 +5,7 @@ unzip, perl, libx11, - libXpm, + libxpm, gpm, ncurses, slang, @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ perl libx11 - libXpm + libxpm gpm ncurses slang diff --git a/pkgs/by-name/fv/fvwm2/package.nix b/pkgs/by-name/fv/fvwm2/package.nix index 580c4a62d8dc..9f9333ae86be 100644 --- a/pkgs/by-name/fv/fvwm2/package.nix +++ b/pkgs/by-name/fv/fvwm2/package.nix @@ -10,7 +10,7 @@ libxcursor, libxft, libxinerama, - libXpm, + libxpm, libXt, libpng, librsvg, @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { libxcursor libxft libxinerama - libXpm + libxpm libXt libpng librsvg diff --git a/pkgs/by-name/fv/fvwm3/package.nix b/pkgs/by-name/fv/fvwm3/package.nix index 26044c18dcf1..54e2ad4fc34a 100644 --- a/pkgs/by-name/fv/fvwm3/package.nix +++ b/pkgs/by-name/fv/fvwm3/package.nix @@ -13,7 +13,7 @@ libxft, libxi, libxinerama, - libXpm, + libxpm, libXrandr, libXt, libevent, @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { libxft libxi libxinerama - libXpm + libxpm libXrandr libXt libevent diff --git a/pkgs/by-name/gd/gd/package.nix b/pkgs/by-name/gd/gd/package.nix index bb1a9c80bffe..550016b21900 100644 --- a/pkgs/by-name/gd/gd/package.nix +++ b/pkgs/by-name/gd/gd/package.nix @@ -12,7 +12,7 @@ libwebp, libtiff, withXorg ? true, - libXpm, + libxpm, libavif, fontconfig, freetype, @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withXorg [ fontconfig - libXpm + libxpm ]; outputs = [ diff --git a/pkgs/by-name/ge/geant4/package.nix b/pkgs/by-name/ge/geant4/package.nix index 457dbd6f5d67..f62e4c0c4db6 100644 --- a/pkgs/by-name/ge/geant4/package.nix +++ b/pkgs/by-name/ge/geant4/package.nix @@ -14,7 +14,7 @@ libx11, libxext, libxmu, - libXpm, + libxpm, motif, python3, qt5, @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { libxmu ] ++ lib.optionals enableInventor [ - libXpm + libxpm coin3d soxt motif diff --git a/pkgs/by-name/gi/giada/package.nix b/pkgs/by-name/gi/giada/package.nix index e680366bd2fc..5162dfaafe66 100644 --- a/pkgs/by-name/gi/giada/package.nix +++ b/pkgs/by-name/gi/giada/package.nix @@ -14,7 +14,7 @@ jack2, alsa-lib, libpulseaudio, - libXpm, + libxpm, libXrandr, flac, libogg, @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { gtk3 jack2 libGL - libXpm + libxpm libXrandr libogg libopus diff --git a/pkgs/by-name/gp/gpsd/package.nix b/pkgs/by-name/gp/gpsd/package.nix index 8d59ff686e07..fb03ded01cd6 100644 --- a/pkgs/by-name/gp/gpsd/package.nix +++ b/pkgs/by-name/gp/gpsd/package.nix @@ -20,7 +20,7 @@ dbus-glib, libx11, libXt, - libXpm, + libxpm, libxaw, libxext, gobject-introspection, @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { libx11 libxaw libxext - libXpm + libxpm libXt pango ]; diff --git a/pkgs/by-name/ha/hackedbox/package.nix b/pkgs/by-name/ha/hackedbox/package.nix index 83b85ef3b7d0..1f45b089b8f0 100644 --- a/pkgs/by-name/ha/hackedbox/package.nix +++ b/pkgs/by-name/ha/hackedbox/package.nix @@ -10,7 +10,7 @@ libxext, libxft, libxinerama, - libXpm, + libxpm, libXrandr, libXrender, pkg-config, @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { libxext libxft libxinerama - libXpm + libxpm libXrandr libXrender xorgproto diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix index c34d4ee2e665..4f86bf7428e3 100644 --- a/pkgs/by-name/ic/icewm/package.nix +++ b/pkgs/by-name/ic/icewm/package.nix @@ -24,7 +24,7 @@ libxfixes, libxft, libxinerama, - libXpm, + libxpm, libXrandr, libjpeg, libogg, @@ -81,7 +81,7 @@ gccStdenv.mkDerivation (finalAttrs: { libxfixes libxft libxinerama - libXpm + libxpm libXrandr libjpeg libogg diff --git a/pkgs/by-name/li/linux-wallpaperengine/package.nix b/pkgs/by-name/li/linux-wallpaperengine/package.nix index 33d2be56abc8..44e5806a735a 100644 --- a/pkgs/by-name/li/linux-wallpaperengine/package.nix +++ b/pkgs/by-name/li/linux-wallpaperengine/package.nix @@ -20,7 +20,7 @@ kissfftFloat, libxau, libxdmcp, - libXpm, + libxpm, libXrandr, libXxf86vm, libdecor, @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { kissfftFloat libxau libxdmcp - libXpm + libxpm libXrandr libXxf86vm libdecor diff --git a/pkgs/by-name/lx/lxpanel/package.nix b/pkgs/by-name/lx/lxpanel/package.nix index 31f378651304..d23c0eed34a5 100644 --- a/pkgs/by-name/lx/lxpanel/package.nix +++ b/pkgs/by-name/lx/lxpanel/package.nix @@ -17,7 +17,7 @@ libwnck, libwnck2, libxmu, - libXpm, + libxpm, cairo, gdk-pixbuf, gdk-pixbuf-xlib, @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { (libfm.override { inherit withGtk3; }) (if withGtk3 then libwnck else libwnck2) libxmu - libXpm + libxpm cairo gdk-pixbuf gdk-pixbuf-xlib.dev diff --git a/pkgs/by-name/ml/mlvwm/package.nix b/pkgs/by-name/ml/mlvwm/package.nix index f64bb0bb4e65..1705496ec0c2 100644 --- a/pkgs/by-name/ml/mlvwm/package.nix +++ b/pkgs/by-name/ml/mlvwm/package.nix @@ -5,7 +5,7 @@ gccmakedep, libx11, libxext, - libXpm, + libxpm, imake, installShellFiles, }: @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { gccmakedep libx11 libxext - libXpm + libxpm imake ]; diff --git a/pkgs/by-name/mu/mup/package.nix b/pkgs/by-name/mu/mup/package.nix index 6bc809661c39..280e8d9ec1ed 100644 --- a/pkgs/by-name/mu/mup/package.nix +++ b/pkgs/by-name/mu/mup/package.nix @@ -10,7 +10,7 @@ netpbm, fltk, libxinerama, - libXpm, + libxpm, libjpeg, }: @@ -40,7 +40,7 @@ stdenv.mkDerivation { buildInputs = [ fltk libxinerama - libXpm + libxpm libjpeg ]; diff --git a/pkgs/by-name/na/nas/package.nix b/pkgs/by-name/na/nas/package.nix index 878d2b3fa830..19648450a628 100644 --- a/pkgs/by-name/na/nas/package.nix +++ b/pkgs/by-name/na/nas/package.nix @@ -9,7 +9,7 @@ libxau, libxaw, libxext, - libXpm, + libxpm, libXt, xorg-cf-files, xorgproto, @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { libxau libxaw libxext - libXpm + libxpm libXt xorgproto ]; diff --git a/pkgs/by-name/ne/nedit/package.nix b/pkgs/by-name/ne/nedit/package.nix index 81182fbc6a04..a6bfb7174496 100644 --- a/pkgs/by-name/ne/nedit/package.nix +++ b/pkgs/by-name/ne/nedit/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, motif, - libXpm, + libxpm, libXt, }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ motif - libXpm + libxpm libXt ]; diff --git a/pkgs/by-name/ne/nethack/package.nix b/pkgs/by-name/ne/nethack/package.nix index 3c1a06c5f39b..e8bfefd11403 100644 --- a/pkgs/by-name/ne/nethack/package.nix +++ b/pkgs/by-name/ne/nethack/package.nix @@ -14,7 +14,7 @@ qtMode ? false, libxaw, libxext, - libXpm, + libxpm, bdftopcf, mkfontdir, pkg-config, @@ -78,7 +78,7 @@ stdenvUsed.mkDerivation (finalAttrs: { ++ lib.optionals x11Mode [ libxaw libxext - libXpm + libxpm ] ++ lib.optionals qtMode [ gzip diff --git a/pkgs/by-name/ne/nexuiz/package.nix b/pkgs/by-name/ne/nexuiz/package.nix index 2139013ed92d..a85ec4010ae6 100644 --- a/pkgs/by-name/ne/nexuiz/package.nix +++ b/pkgs/by-name/ne/nexuiz/package.nix @@ -16,7 +16,7 @@ libx11, libGLU, libGL, - libXpm, + libxpm, libxext, libXxf86vm, libXxf86dga, @@ -51,7 +51,7 @@ stdenv.mkDerivation { libx11 libGLU libGL - libXpm + libxpm libxext libXxf86vm libXxf86dga diff --git a/pkgs/by-name/pe/pekwm/package.nix b/pkgs/by-name/pe/pekwm/package.nix index 797fff9ea9d9..be85d787be06 100644 --- a/pkgs/by-name/pe/pekwm/package.nix +++ b/pkgs/by-name/pe/pekwm/package.nix @@ -8,7 +8,7 @@ libxext, libxft, libxinerama, - libXpm, + libxpm, libXrandr, libjpeg, libpng, @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { libxext libxft libxinerama - libXpm + libxpm libXrandr libjpeg libpng diff --git a/pkgs/by-name/ra/ratpoison/package.nix b/pkgs/by-name/ra/ratpoison/package.nix index 0eda1872de03..027e30e60e28 100644 --- a/pkgs/by-name/ra/ratpoison/package.nix +++ b/pkgs/by-name/ra/ratpoison/package.nix @@ -8,7 +8,7 @@ libx11, libxft, libxi, - libXpm, + libxpm, libXrandr, libXt, libXtst, @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { libx11 libxft libxi - libXpm + libxpm libXrandr libXt libXtst diff --git a/pkgs/by-name/rk/rkrlv2/package.nix b/pkgs/by-name/rk/rkrlv2/package.nix index cad65f33b906..42f9a7a37f3a 100644 --- a/pkgs/by-name/rk/rkrlv2/package.nix +++ b/pkgs/by-name/rk/rkrlv2/package.nix @@ -6,7 +6,7 @@ lv2, fftw, cmake, - libXpm, + libxpm, libxft, libjack2, libsamplerate, @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libxft - libXpm + libxpm lv2 fftw libjack2 diff --git a/pkgs/by-name/rx/rxvt/package.nix b/pkgs/by-name/rx/rxvt/package.nix index 9678f0b5082c..c4867528029c 100644 --- a/pkgs/by-name/rx/rxvt/package.nix +++ b/pkgs/by-name/rx/rxvt/package.nix @@ -6,7 +6,7 @@ libtool, libx11, libXt, - libXpm, + libxpm, }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { libtool libx11 libXt - libXpm + libxpm ]; configurePhase = '' diff --git a/pkgs/by-name/sd/SDL_image/package.nix b/pkgs/by-name/sd/SDL_image/package.nix index b1595498d106..9110ec50d236 100644 --- a/pkgs/by-name/sd/SDL_image/package.nix +++ b/pkgs/by-name/sd/SDL_image/package.nix @@ -3,7 +3,7 @@ SDL, fetchFromGitHub, giflib, - libXpm, + libxpm, libjpeg, libpng, libtiff, @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ SDL giflib - libXpm + libxpm libjpeg libpng libtiff diff --git a/pkgs/by-name/sh/shod/package.nix b/pkgs/by-name/sh/shod/package.nix index fb75de216506..e91e1359dbca 100644 --- a/pkgs/by-name/sh/shod/package.nix +++ b/pkgs/by-name/sh/shod/package.nix @@ -6,7 +6,7 @@ fontconfig, libx11, libxft, - libXpm, + libxpm, libXrandr, libXrender, conf ? null, @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { fontconfig libx11 libxft - libXpm + libxpm libXrandr libXrender ]; diff --git a/pkgs/by-name/st/stalonetray/package.nix b/pkgs/by-name/st/stalonetray/package.nix index 85b350a6bb00..6222d910ed2a 100644 --- a/pkgs/by-name/st/stalonetray/package.nix +++ b/pkgs/by-name/st/stalonetray/package.nix @@ -5,7 +5,7 @@ fetchFromGitHub, lib, libx11, - libXpm, + libxpm, libxslt, stdenv, }: @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { docbook-xsl-ns docbook_xml_dtd_44 libx11 - libXpm + libxpm libxslt ]; diff --git a/pkgs/by-name/st/stereotool/package.nix b/pkgs/by-name/st/stereotool/package.nix index c1c23be557f0..1a5ccb1e7446 100644 --- a/pkgs/by-name/st/stereotool/package.nix +++ b/pkgs/by-name/st/stereotool/package.nix @@ -4,7 +4,7 @@ fetchurl, autoPatchelfHook, libx11, - libXpm, + libxpm, alsa-lib, bzip2, zlib, @@ -155,7 +155,7 @@ stdenv.mkDerivation rec { alsa-lib bzip2 zlib - libXpm + libxpm libgcc ]; diff --git a/pkgs/by-name/sv/sview/package.nix b/pkgs/by-name/sv/sview/package.nix index 2604ba7ed0ce..2175f700478d 100644 --- a/pkgs/by-name/sv/sview/package.nix +++ b/pkgs/by-name/sv/sview/package.nix @@ -7,7 +7,7 @@ lib, libconfig, libGL, - libXpm, + libxpm, makeFontsConf, makeWrapper, nanum, @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { gtk2 libconfig libGL - libXpm + libxpm openal ]; diff --git a/pkgs/by-name/sw/swi-prolog/package.nix b/pkgs/by-name/sw/swi-prolog/package.nix index 1adc31c271b1..47ac51a1402c 100644 --- a/pkgs/by-name/sw/swi-prolog/package.nix +++ b/pkgs/by-name/sw/swi-prolog/package.nix @@ -34,7 +34,7 @@ libyaml, withGui ? false, - libXpm, + libxpm, libxext, libxft, libxinerama, @@ -104,7 +104,7 @@ let ++ (lib.optionals withGui' [ libXt libxext - libXpm + libxpm libxft libxinerama libjpeg diff --git a/pkgs/by-name/vl/vlc/package.nix b/pkgs/by-name/vl/vlc/package.nix index 541873a0120f..595062e3cb95 100644 --- a/pkgs/by-name/vl/vlc/package.nix +++ b/pkgs/by-name/vl/vlc/package.nix @@ -24,7 +24,7 @@ libsm, libxext, libxinerama, - libXpm, + libxpm, libarchive, libass, libbluray-full, @@ -205,7 +205,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals skins2Support [ libxext libxinerama - libXpm + libxpm ] ++ optionals waylandSupport [ wayland diff --git a/pkgs/by-name/vn/vncrec/package.nix b/pkgs/by-name/vn/vncrec/package.nix index ac0946e86963..7a00af1f135b 100644 --- a/pkgs/by-name/vn/vncrec/package.nix +++ b/pkgs/by-name/vn/vncrec/package.nix @@ -12,7 +12,7 @@ libxext, libsm, libice, - libXpm, + libxpm, libXp, }: @@ -49,7 +49,7 @@ stdenv.mkDerivation { libxext libsm libice - libXpm + libxpm libXp ]; diff --git a/pkgs/by-name/wa/wallutils/package.nix b/pkgs/by-name/wa/wallutils/package.nix index 54a28cf554f0..05d52847eac5 100644 --- a/pkgs/by-name/wa/wallutils/package.nix +++ b/pkgs/by-name/wa/wallutils/package.nix @@ -5,7 +5,7 @@ libx11, libxcursor, libxmu, - libXpm, + libxpm, libheif, pkg-config, wayland, @@ -41,7 +41,7 @@ buildGoModule (finalAttrs: { libx11 libxcursor libxmu - libXpm + libxpm libheif wayland xbitmaps diff --git a/pkgs/by-name/wi/windowmaker/dockapps/AlsaMixer-app.nix b/pkgs/by-name/wi/windowmaker/dockapps/AlsaMixer-app.nix index 917ecac50d2b..6de621633e44 100644 --- a/pkgs/by-name/wi/windowmaker/dockapps/AlsaMixer-app.nix +++ b/pkgs/by-name/wi/windowmaker/dockapps/AlsaMixer-app.nix @@ -5,7 +5,7 @@ dockapps-sources, libx11, libxext, - libXpm, + libxpm, pkg-config, }: @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ alsa-lib libx11 - libXpm + libxpm libxext ]; diff --git a/pkgs/by-name/wi/windowmaker/dockapps/cputnik.nix b/pkgs/by-name/wi/windowmaker/dockapps/cputnik.nix index 2f703bcc85c8..7a6add268f52 100644 --- a/pkgs/by-name/wi/windowmaker/dockapps/cputnik.nix +++ b/pkgs/by-name/wi/windowmaker/dockapps/cputnik.nix @@ -4,7 +4,7 @@ dockapps-sources, libx11, libxext, - libXpm, + libxpm, }: stdenv.mkDerivation (finalAttrs: { @@ -16,14 +16,14 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libx11 - libXpm + libxpm libxext ]; preBuild = '' makeFlagsArray+=( - INCS="-I${libx11.dev}/include -I${libxext.dev}/include -I${libXpm.dev}/include" - LIBS="-L${libx11}/lib -L${libxext}/lib -L${libXpm}/lib -lX11 -lXpm -lXext" + INCS="-I${libx11.dev}/include -I${libxext.dev}/include -I${libxpm.dev}/include" + LIBS="-L${libx11}/lib -L${libxext}/lib -L${libxpm}/lib -lX11 -lXpm -lXext" ) ''; diff --git a/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix b/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix index 3b8fe56a3755..3001bef81392 100644 --- a/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix +++ b/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix @@ -6,7 +6,7 @@ font-util, libx11, libxext, - libXpm, + libxpm, mkfontdir, pkg-config, }: @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libx11 libxext - libXpm + libxpm font-util mkfontdir ]; diff --git a/pkgs/by-name/wi/windowmaker/dockapps/wmCalClock.nix b/pkgs/by-name/wi/windowmaker/dockapps/wmCalClock.nix index d6184fc0afbe..03671dd51353 100644 --- a/pkgs/by-name/wi/windowmaker/dockapps/wmCalClock.nix +++ b/pkgs/by-name/wi/windowmaker/dockapps/wmCalClock.nix @@ -4,7 +4,7 @@ dockapps-sources, libx11, libxext, - libXpm, + libxpm, }: stdenv.mkDerivation (finalAttrs: { @@ -16,15 +16,15 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libx11 - libXpm + libxpm libxext ]; preBuild = '' makeFlagsArray+=( CC="cc" - INCDIR="-I${libx11.dev}/include -I${libxext.dev}/include -I${libXpm.dev}/include" - LIBDIR="-I${libx11}/lib -I${libxext}/lib -I${libXpm}/lib" + INCDIR="-I${libx11.dev}/include -I${libxext.dev}/include -I${libxpm.dev}/include" + LIBDIR="-I${libx11}/lib -I${libxext}/lib -I${libxpm}/lib" ) ''; diff --git a/pkgs/by-name/wi/windowmaker/dockapps/wmcube.nix b/pkgs/by-name/wi/windowmaker/dockapps/wmcube.nix index 7bb57e161025..67fc33d1ce4c 100644 --- a/pkgs/by-name/wi/windowmaker/dockapps/wmcube.nix +++ b/pkgs/by-name/wi/windowmaker/dockapps/wmcube.nix @@ -3,7 +3,7 @@ stdenv, dockapps-sources, libx11, - libXpm, + libxpm, libxext, libdockapp, }: @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libx11 libxext - libXpm + libxpm libdockapp ]; @@ -30,9 +30,9 @@ stdenv.mkDerivation (finalAttrs: { PREFIX="${placeholder "out"}" VERSION="${finalAttrs.version}" LIBDIR="-L${lib.getLib libx11}/lib -L${lib.getLib libxext}/lib \ - -L${lib.getLib libXpm}/lib -L${lib.getLib libdockapp}/lib" + -L${lib.getLib libxpm}/lib -L${lib.getLib libdockapp}/lib" INCDIR="-I${lib.getDev libx11}/lib -I${lib.getDev libxext}/lib \ - -I${lib.getDev libXpm}/lib -I${lib.getDev libdockapp}/lib" + -I${lib.getDev libxpm}/lib -I${lib.getDev libdockapp}/lib" LIBS="-lm -lXpm -lXext -lX11 -ldockapp" ) ''; diff --git a/pkgs/by-name/wi/windowmaker/dockapps/wmsm-app.nix b/pkgs/by-name/wi/windowmaker/dockapps/wmsm-app.nix index dc5d86db7303..0bfeb962f4b4 100644 --- a/pkgs/by-name/wi/windowmaker/dockapps/wmsm-app.nix +++ b/pkgs/by-name/wi/windowmaker/dockapps/wmsm-app.nix @@ -3,7 +3,7 @@ stdenv, dockapps-sources, libx11, - libXpm, + libxpm, libxext, libdockapp, }: @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libx11 libxext - libXpm + libxpm libdockapp ]; diff --git a/pkgs/by-name/wi/windowmaker/dockapps/wmsystemtray.nix b/pkgs/by-name/wi/windowmaker/dockapps/wmsystemtray.nix index 85620f31dcde..2adaac2d6944 100644 --- a/pkgs/by-name/wi/windowmaker/dockapps/wmsystemtray.nix +++ b/pkgs/by-name/wi/windowmaker/dockapps/wmsystemtray.nix @@ -6,7 +6,7 @@ libxext, libxfixes, libxmu, - libXpm, + libxpm, pkg-config, }: @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { libxext libxfixes libxmu - libXpm + libxpm ]; meta = { diff --git a/pkgs/by-name/wi/windowmaker/package.nix b/pkgs/by-name/wi/windowmaker/package.nix index 47b55f6bed8a..3b0163af5b66 100644 --- a/pkgs/by-name/wi/windowmaker/package.nix +++ b/pkgs/by-name/wi/windowmaker/package.nix @@ -11,7 +11,7 @@ libxft, libxinerama, libxmu, - libXpm, + libxpm, libXrandr, libXres, libexif, @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { libxft libxinerama libxmu - libXpm + libxpm libXrandr libXres libexif diff --git a/pkgs/by-name/wm/wmfs/package.nix b/pkgs/by-name/wm/wmfs/package.nix index 597dd4d82d7b..b47bf55923cb 100644 --- a/pkgs/by-name/wm/wmfs/package.nix +++ b/pkgs/by-name/wm/wmfs/package.nix @@ -6,7 +6,7 @@ libx11, libxinerama, libXrandr, - libXpm, + libxpm, libxft, imlib2, }: @@ -38,7 +38,7 @@ stdenv.mkDerivation { libx11 libxinerama libXrandr - libXpm + libxpm libxft ]; diff --git a/pkgs/by-name/x2/x2goclient/package.nix b/pkgs/by-name/x2/x2goclient/package.nix index 93d118d415a9..623e5aec9e0f 100644 --- a/pkgs/by-name/x2/x2goclient/package.nix +++ b/pkgs/by-name/x2/x2goclient/package.nix @@ -6,7 +6,7 @@ pkg-config, bash, cups, - libXpm, + libxpm, libssh, nx-libs, openldap, @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cups - libXpm + libxpm libssh libsForQt5.phonon libsForQt5.qtbase diff --git a/pkgs/by-name/xa/Xaw3d/package.nix b/pkgs/by-name/xa/Xaw3d/package.nix index 3bdd7728e343..b5f0ef5b9bd0 100644 --- a/pkgs/by-name/xa/Xaw3d/package.nix +++ b/pkgs/by-name/xa/Xaw3d/package.nix @@ -7,7 +7,7 @@ pkg-config, libxext, libxmu, - libXpm, + libxpm, libXp, libXt, xorgproto, @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ libxext - libXpm + libxpm libXp ]; propagatedBuildInputs = [ diff --git a/pkgs/by-name/xa/xawtv/package.nix b/pkgs/by-name/xa/xawtv/package.nix index 02cf9d66e2b6..e09644d68291 100644 --- a/pkgs/by-name/xa/xawtv/package.nix +++ b/pkgs/by-name/xa/xawtv/package.nix @@ -13,7 +13,7 @@ libv4l, libfs, libxaw, - libXpm, + libxpm, libxext, libsm, libice, @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { alsa-lib aalib libxaw - libXpm + libxpm libxext libsm libice diff --git a/pkgs/by-name/xb/xbill/package.nix b/pkgs/by-name/xb/xbill/package.nix index 0b87acea1e9d..43d4bed69ce0 100644 --- a/pkgs/by-name/xb/xbill/package.nix +++ b/pkgs/by-name/xb/xbill/package.nix @@ -7,7 +7,7 @@ fetchpatch, fetchurl, libx11, - libXpm, + libxpm, libXt, motif, }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ libx11 - libXpm + libxpm libXt motif ]; diff --git a/pkgs/by-name/xb/xboard/package.nix b/pkgs/by-name/xb/xboard/package.nix index cb9ad07fdc83..e571be764d62 100644 --- a/pkgs/by-name/xb/xboard/package.nix +++ b/pkgs/by-name/xb/xboard/package.nix @@ -13,7 +13,7 @@ libxext, gnuchess, texinfo, - libXpm, + libxpm, pkg-config, librsvg, cairo, @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { libxext gnuchess texinfo - libXpm + libxpm librsvg cairo pango diff --git a/pkgs/by-name/xc/xcruiser/package.nix b/pkgs/by-name/xc/xcruiser/package.nix index b29e498c2c6e..eae4c6fc4181 100644 --- a/pkgs/by-name/xc/xcruiser/package.nix +++ b/pkgs/by-name/xc/xcruiser/package.nix @@ -6,7 +6,7 @@ imake, libXt, libxaw, - libXpm, + libxpm, libxext, copyDesktopItems, makeDesktopItem, @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libXt libxaw - libXpm + libxpm libxext ]; diff --git a/pkgs/by-name/xf/xfig/package.nix b/pkgs/by-name/xf/xfig/package.nix index 503870b2ee45..bb12bb70e629 100644 --- a/pkgs/by-name/xf/xfig/package.nix +++ b/pkgs/by-name/xf/xfig/package.nix @@ -5,7 +5,7 @@ fetchpatch, makeWrapper, imagemagick, - libXpm, + libxpm, libxmu, libxi, libXp, @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libXpm + libxpm libxmu libxi libXp diff --git a/pkgs/by-name/xg/xgalagapp/package.nix b/pkgs/by-name/xg/xgalagapp/package.nix index 9e530f9b07bb..ff246a9dfc0c 100644 --- a/pkgs/by-name/xg/xgalagapp/package.nix +++ b/pkgs/by-name/xg/xgalagapp/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, libx11, - libXpm, + libxpm, }: stdenv.mkDerivation (finalAttrs: { @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libx11 - libXpm + libxpm ]; buildFlags = [ diff --git a/pkgs/by-name/xk/xkbd/package.nix b/pkgs/by-name/xk/xkbd/package.nix index 2933c4913fc2..ac618e9c3ea7 100644 --- a/pkgs/by-name/xk/xkbd/package.nix +++ b/pkgs/by-name/xk/xkbd/package.nix @@ -10,7 +10,7 @@ libxi, libxext, libXtst, - libXpm, + libxpm, libx11, autoreconfHook, }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { libxft libxext libXtst - libXpm + libxpm libx11 libxi xorgproto diff --git a/pkgs/by-name/xo/xosview/package.nix b/pkgs/by-name/xo/xosview/package.nix index dd6d72132bbf..a9fd41cf281d 100644 --- a/pkgs/by-name/xo/xosview/package.nix +++ b/pkgs/by-name/xo/xosview/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, libx11, - libXpm, + libxpm, }: stdenv.mkDerivation (finalAttrs: { @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libx11 - libXpm + libxpm ]; makeFlags = [ diff --git a/pkgs/by-name/xs/xschem/package.nix b/pkgs/by-name/xs/xschem/package.nix index bb08dbfa1cfc..e524c83017ca 100644 --- a/pkgs/by-name/xs/xschem/package.nix +++ b/pkgs/by-name/xs/xschem/package.nix @@ -6,7 +6,7 @@ cairo, flex, libx11, - libXpm, + libxpm, pkg-config, tcl, tk, @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cairo libx11 - libXpm + libxpm tcl tk ]; diff --git a/pkgs/by-name/xs/xsok/package.nix b/pkgs/by-name/xs/xsok/package.nix index a79a870bd589..104e76c8b3a8 100644 --- a/pkgs/by-name/xs/xsok/package.nix +++ b/pkgs/by-name/xs/xsok/package.nix @@ -6,7 +6,7 @@ imake, libXt, libxaw, - libXpm, + libxpm, libxext, withNethackLevels ? true, }: @@ -28,12 +28,12 @@ stdenv.mkDerivation rec { libx11 libXt libxaw - libXpm + libxpm libxext ]; nativeBuildInputs = [ imake ]; - env.NIX_CFLAGS_COMPILE = " -isystem ${libXpm.dev}/include/X11 "; + env.NIX_CFLAGS_COMPILE = " -isystem ${libxpm.dev}/include/X11 "; preConfigure = '' sed -e "s@/usr/@$out/share/@g" -i src/Imakefile diff --git a/pkgs/by-name/xs/xsokoban/package.nix b/pkgs/by-name/xs/xsokoban/package.nix index 997d72ef1773..834eb440ad2e 100644 --- a/pkgs/by-name/xs/xsokoban/package.nix +++ b/pkgs/by-name/xs/xsokoban/package.nix @@ -4,7 +4,7 @@ fetchurl, libx11, xorgproto, - libXpm, + libxpm, libXt, }: @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { buildInputs = [ libx11 xorgproto - libXpm + libxpm libXt ]; - env.NIX_CFLAGS_COMPILE = "-I${libXpm.dev}/include/X11 -Wno-error=implicit-int -Wno-error=implicit-function-declaration"; + env.NIX_CFLAGS_COMPILE = "-I${libxpm.dev}/include/X11 -Wno-error=implicit-int -Wno-error=implicit-function-declaration"; hardeningDisable = [ "format" ]; diff --git a/pkgs/by-name/xv/xvkbd/package.nix b/pkgs/by-name/xv/xvkbd/package.nix index 4b103b1ced74..bfad29669082 100644 --- a/pkgs/by-name/xv/xvkbd/package.nix +++ b/pkgs/by-name/xv/xvkbd/package.nix @@ -6,7 +6,7 @@ libxaw, libXtst, libxi, - libXpm, + libxpm, pkg-config, xorgproto, Xaw3d, @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { xorgproto libxi Xaw3d - libXpm + libxpm ]; makeFlags = [ diff --git a/pkgs/by-name/xw/xwallpaper/package.nix b/pkgs/by-name/xw/xwallpaper/package.nix index d7906269f86e..dbd0f710e5a9 100644 --- a/pkgs/by-name/xw/xwallpaper/package.nix +++ b/pkgs/by-name/xw/xwallpaper/package.nix @@ -11,7 +11,7 @@ libseccomp, libjpeg, libpng, - libXpm, + libxpm, }: stdenv.mkDerivation (finalAttrs: { @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { libseccomp libjpeg libpng - libXpm + libxpm ]; postInstall = '' diff --git a/pkgs/by-name/xw/xwayland/package.nix b/pkgs/by-name/xw/xwayland/package.nix index dea95d096862..861e6195f10f 100644 --- a/pkgs/by-name/xw/xwayland/package.nix +++ b/pkgs/by-name/xw/xwayland/package.nix @@ -19,7 +19,7 @@ libxfixes, libxfont_2, libxmu, - libXpm, + libxpm, libXrender, libXres, libXt, @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { libxfixes libxfont_2 libxmu - libXpm + libxpm libXrender libXres libXt diff --git a/pkgs/by-name/xx/xxkb/package.nix b/pkgs/by-name/xx/xxkb/package.nix index aaa3e9cacf00..c9c1f6e03d32 100644 --- a/pkgs/by-name/xx/xxkb/package.nix +++ b/pkgs/by-name/xx/xxkb/package.nix @@ -5,7 +5,7 @@ libx11, libXt, libxext, - libXpm, + libxpm, imake, gccmakedep, svgSupport ? false, @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { libx11 libXt libxext - libXpm + libxpm ] ++ lib.optionals svgSupport [ librsvg diff --git a/pkgs/development/compilers/fbc/default.nix b/pkgs/development/compilers/fbc/default.nix index 6f5873041adf..3d13785bd172 100644 --- a/pkgs/development/compilers/fbc/default.nix +++ b/pkgs/development/compilers/fbc/default.nix @@ -8,7 +8,7 @@ libGL, libx11, libxext, - libXpm, + libxpm, libXrandr, ncurses, }: @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { libGL libx11 libxext - libXpm + libxpm libXrandr ]; diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index d82ac4878428..8eed8cf0d23d 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -22,7 +22,7 @@ libx11, libxau, libXt, - libXpm, + libxpm, libxext, xorgproto, coreutils, @@ -48,7 +48,7 @@ assert libx11 != null && libxau != null && libXt != null - && libXpm != null + && libxpm != null && xorgproto != null && libxext != null ); @@ -89,7 +89,7 @@ stdenv.mkDerivation { libx11 libxau libXt - libXpm + libxpm xorgproto libxext ]; diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 7981e61b65c0..9c92cb1cab95 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -25,7 +25,7 @@ libxext, libxfixes, libxi, - libXpm, + libxpm, libXt, libXxf86dga, libXxf86misc, @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { libxext libxfixes libxi - libXpm + libxpm libXt libXxf86dga libXxf86misc diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 8531ada3bd92..3df2e6873b3e 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -6,7 +6,7 @@ libxext, xorgproto, libx11, - libXpm, + libxpm, libXt, libxcursor, alsa-lib, @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { libxext xorgproto libx11 - libXpm + libxpm libXt libxcursor alsa-lib diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 06d8e19df45e..6f01eb32636f 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -21,7 +21,7 @@ # glx libGLU, libGL, - libXpm, + libxpm, libxext, libXxf86vm, alsa-lib, @@ -105,7 +105,7 @@ let ++ lib.optionals withGLX [ libGLU libGL - libXpm + libxpm libxext libXxf86vm alsa-lib diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 950652d1971c..344f67f6b247 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -19,7 +19,7 @@ libcaca, libx11, libXt, - libXpm, + libxpm, libxaw, aquaterm ? false, withWxGTK ? false, @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ++ lib.optional withCaca libcaca ++ lib.optionals withX [ libx11 - libXpm + libxpm libXt libxaw ]