diff options
Diffstat (limited to 'pkgs/applications/window-managers')
11 files changed, 74 insertions, 74 deletions
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 25438c81605..5c897926432 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkgconfig, gdk_pixbuf +{ stdenv, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkgconfig, gdk-pixbuf , xorg, libstartup_notification, libxdg_basedir, libpthreadstubs , xcb-util-cursor, makeWrapper, pango, gobject-introspection , which, dbus, nettools, git, doxygen @@ -40,7 +40,7 @@ with luaPackages; stdenv.mkDerivation rec { FONTCONFIG_FILE = toString fontsConf; propagatedUserEnvPkgs = [ hicolor-icon-theme ]; - buildInputs = [ cairo librsvg dbus gdk_pixbuf gobject-introspection + buildInputs = [ cairo librsvg dbus gdk-pixbuf gobject-introspection git lgi libpthreadstubs libstartup_notification libxdg_basedir lua nettools pango xcb-util-cursor xorg.libXau xorg.libXdmcp xorg.libxcb xorg.libxshmfence diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 734d70598fb..5ffd94e9f87 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk_pixbuf, libnotify, makeWrapper, pkgconfig, xorg +{ stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkgconfig, xorg , enableAlsaUtils ? true, alsaUtils, coreutils , enableNetwork ? true, dnsutils, iproute, wirelesstools }: @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ makeWrapper pkgconfig ]; - buildInputs = [ dbus gdk_pixbuf libnotify xorg.libX11 ]; + buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ]; cargoSha256 = "1r2wczfkdpvjc7iylwajkminraaz1ix6n724in0dvv5klfcdxlxb"; diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index 8406736541c..2f6199122f1 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, gettext , libjpeg, libtiff, libungif, libpng, imlib, expat -, freetype, fontconfig, pkgconfig, gdk_pixbuf +, freetype, fontconfig, pkgconfig, gdk-pixbuf , mkfontdir, libX11, libXft, libXext, libXinerama , libXrandr, libICE, libSM, libXpm, libXdmcp, libxcb , libpthreadstubs, pcre }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake gettext libjpeg libtiff libungif libpng imlib expat - freetype fontconfig pkgconfig gdk_pixbuf mkfontdir libX11 + freetype fontconfig pkgconfig gdk-pixbuf mkfontdir libX11 libXft libXext libXinerama libXrandr libICE libSM libXpm libXdmcp libxcb libpthreadstubs pcre ]; diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix index 887a58b748d..d8bb58c21b6 100644 --- a/pkgs/applications/window-managers/sawfish/default.nix +++ b/pkgs/applications/window-managers/sawfish/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , pkgconfig, which, autoreconfHook -, rep-gtk, pango, gdk_pixbuf +, rep-gtk, pango, gdk-pixbuf , imlib, gettext, texinfo , libXinerama, libXrandr, libXtst, libICE, libSM , makeWrapper @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ which - rep-gtk pango gdk_pixbuf imlib gettext texinfo + rep-gtk pango gdk-pixbuf imlib gettext texinfo libXinerama libXrandr libXtst libICE libSM makeWrapper ]; diff --git a/pkgs/applications/window-managers/sway/bg.nix b/pkgs/applications/window-managers/sway/bg.nix index d68cacf666f..595197a3f6f 100644 --- a/pkgs/applications/window-managers/sway/bg.nix +++ b/pkgs/applications/window-managers/sway/bg.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , meson, ninja, pkgconfig, scdoc -, wayland, wayland-protocols, cairo, gdk_pixbuf +, wayland, wayland-protocols, cairo, gdk-pixbuf }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; - buildInputs = [ wayland wayland-protocols cairo gdk_pixbuf ]; + buildInputs = [ wayland wayland-protocols cairo gdk-pixbuf ]; mesonFlags = [ "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled" diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 7d5c4c05131..12427b91265 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -2,7 +2,7 @@ , meson, ninja , pkgconfig, scdoc , wayland, libxkbcommon, pcre, json_c, dbus, libevdev -, pango, cairo, libinput, libcap, pam, gdk_pixbuf +, pango, cairo, libinput, libcap, pam, gdk-pixbuf , wlroots, wayland-protocols, swaybg }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland libxkbcommon pcre json_c dbus libevdev - pango cairo libinput libcap pam gdk_pixbuf + pango cairo libinput libcap pam gdk-pixbuf wlroots wayland-protocols ]; diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix index a7505e14168..80d6ed4e072 100644 --- a/pkgs/applications/window-managers/sway/lock.nix +++ b/pkgs/applications/window-managers/sway/lock.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , meson, ninja, pkgconfig, scdoc -, wayland, wayland-protocols, libxkbcommon, cairo, gdk_pixbuf, pam +, wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; - buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk_pixbuf pam ]; + buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ]; mesonFlags = [ "-Dpam=enabled" "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled" diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix index 5aec0973a7c..5705ae8256c 100644 --- a/pkgs/applications/window-managers/trayer/default.nix +++ b/pkgs/applications/window-managers/trayer/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, gtk2 }: +{ stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, gtk2 }: stdenv.mkDerivation rec { name = "trayer-1.1.8"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gdk_pixbuf gtk2 ]; + buildInputs = [ gdk-pixbuf gtk2 ]; src = fetchFromGitHub { owner = "sargon"; diff --git a/pkgs/applications/window-managers/way-cooler/crates-io.nix b/pkgs/applications/window-managers/way-cooler/crates-io.nix index 9dbd367a67f..29e25640191 100644 --- a/pkgs/applications/window-managers/way-cooler/crates-io.nix +++ b/pkgs/applications/window-managers/way-cooler/crates-io.nix @@ -546,76 +546,76 @@ rec { # end # gdk-pixbuf-0.2.0 - crates.gdk_pixbuf."0.2.0" = deps: { features?(features_.gdk_pixbuf."0.2.0" deps {}) }: buildRustCrate { + crates.gdk-pixbuf."0.2.0" = deps: { features?(features_.gdk-pixbuf."0.2.0" deps {}) }: buildRustCrate { crateName = "gdk-pixbuf"; version = "0.2.0"; authors = [ "The Gtk-rs Project Developers" ]; sha256 = "082z1s30haa59ax35wsv06mj8z8bhhq0fac36g01qa77kpiphj5y"; - libName = "gdk_pixbuf"; + libName = "gdk-pixbuf"; build = "build.rs"; dependencies = mapFeatures features ([ - (crates."gdk_pixbuf_sys"."${deps."gdk_pixbuf"."0.2.0"."gdk_pixbuf_sys"}" deps) - (crates."glib"."${deps."gdk_pixbuf"."0.2.0"."glib"}" deps) - (crates."glib_sys"."${deps."gdk_pixbuf"."0.2.0"."glib_sys"}" deps) - (crates."gobject_sys"."${deps."gdk_pixbuf"."0.2.0"."gobject_sys"}" deps) - (crates."libc"."${deps."gdk_pixbuf"."0.2.0"."libc"}" deps) + (crates."gdk_pixbuf_sys"."${deps."gdk-pixbuf"."0.2.0"."gdk_pixbuf_sys"}" deps) + (crates."glib"."${deps."gdk-pixbuf"."0.2.0"."glib"}" deps) + (crates."glib_sys"."${deps."gdk-pixbuf"."0.2.0"."glib_sys"}" deps) + (crates."gobject_sys"."${deps."gdk-pixbuf"."0.2.0"."gobject_sys"}" deps) + (crates."libc"."${deps."gdk-pixbuf"."0.2.0"."libc"}" deps) ]); buildDependencies = mapFeatures features ([ ]); - features = mkFeatures (features."gdk_pixbuf"."0.2.0" or {}); + features = mkFeatures (features."gdk-pixbuf"."0.2.0" or {}); }; - features_.gdk_pixbuf."0.2.0" = deps: f: updateFeatures f (rec { - gdk_pixbuf = fold recursiveUpdate {} [ - { "0.2.0".default = (f.gdk_pixbuf."0.2.0".default or true); } + features_.gdk-pixbuf."0.2.0" = deps: f: updateFeatures f (rec { + gdk-pixbuf = fold recursiveUpdate {} [ + { "0.2.0".default = (f.gdk-pixbuf."0.2.0".default or true); } { "0.2.0".gtk-rs-lgpl-docs = - (f.gdk_pixbuf."0.2.0".gtk-rs-lgpl-docs or false) || - (f.gdk_pixbuf."0.2.0".embed-lgpl-docs or false) || - (gdk_pixbuf."0.2.0"."embed-lgpl-docs" or false) || - (f.gdk_pixbuf."0.2.0".purge-lgpl-docs or false) || - (gdk_pixbuf."0.2.0"."purge-lgpl-docs" or false); } + (f.gdk-pixbuf."0.2.0".gtk-rs-lgpl-docs or false) || + (f.gdk-pixbuf."0.2.0".embed-lgpl-docs or false) || + (gdk-pixbuf."0.2.0"."embed-lgpl-docs" or false) || + (f.gdk-pixbuf."0.2.0".purge-lgpl-docs or false) || + (gdk-pixbuf."0.2.0"."purge-lgpl-docs" or false); } { "0.2.0".v2_28 = - (f.gdk_pixbuf."0.2.0".v2_28 or false) || - (f.gdk_pixbuf."0.2.0".v2_30 or false) || - (gdk_pixbuf."0.2.0"."v2_30" or false); } + (f.gdk-pixbuf."0.2.0".v2_28 or false) || + (f.gdk-pixbuf."0.2.0".v2_30 or false) || + (gdk-pixbuf."0.2.0"."v2_30" or false); } { "0.2.0".v2_30 = - (f.gdk_pixbuf."0.2.0".v2_30 or false) || - (f.gdk_pixbuf."0.2.0".v2_32 or false) || - (gdk_pixbuf."0.2.0"."v2_32" or false); } + (f.gdk-pixbuf."0.2.0".v2_30 or false) || + (f.gdk-pixbuf."0.2.0".v2_32 or false) || + (gdk-pixbuf."0.2.0"."v2_32" or false); } { "0.2.0".v2_32 = - (f.gdk_pixbuf."0.2.0".v2_32 or false) || - (f.gdk_pixbuf."0.2.0".v2_36 or false) || - (gdk_pixbuf."0.2.0"."v2_36" or false); } + (f.gdk-pixbuf."0.2.0".v2_32 or false) || + (f.gdk-pixbuf."0.2.0".v2_36 or false) || + (gdk-pixbuf."0.2.0"."v2_36" or false); } ]; gdk_pixbuf_sys = fold recursiveUpdate {} [ - { "${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_28" = - (f.gdk_pixbuf_sys."${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_28" or false) || - (gdk_pixbuf."0.2.0"."v2_28" or false) || - (f."gdk_pixbuf"."0.2.0"."v2_28" or false); } - { "${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_30" = - (f.gdk_pixbuf_sys."${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_30" or false) || - (gdk_pixbuf."0.2.0"."v2_30" or false) || - (f."gdk_pixbuf"."0.2.0"."v2_30" or false); } - { "${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_32" = - (f.gdk_pixbuf_sys."${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_32" or false) || - (gdk_pixbuf."0.2.0"."v2_32" or false) || - (f."gdk_pixbuf"."0.2.0"."v2_32" or false); } - { "${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_36" = - (f.gdk_pixbuf_sys."${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_36" or false) || - (gdk_pixbuf."0.2.0"."v2_36" or false) || - (f."gdk_pixbuf"."0.2.0"."v2_36" or false); } - { "${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}".default = true; } + { "${deps.gdk-pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_28" = + (f.gdk_pixbuf_sys."${deps.gdk-pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_28" or false) || + (gdk-pixbuf."0.2.0"."v2_28" or false) || + (f."gdk-pixbuf"."0.2.0"."v2_28" or false); } + { "${deps.gdk-pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_30" = + (f.gdk_pixbuf_sys."${deps.gdk-pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_30" or false) || + (gdk-pixbuf."0.2.0"."v2_30" or false) || + (f."gdk-pixbuf"."0.2.0"."v2_30" or false); } + { "${deps.gdk-pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_32" = + (f.gdk_pixbuf_sys."${deps.gdk-pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_32" or false) || + (gdk-pixbuf."0.2.0"."v2_32" or false) || + (f."gdk-pixbuf"."0.2.0"."v2_32" or false); } + { "${deps.gdk-pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_36" = + (f.gdk_pixbuf_sys."${deps.gdk-pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_36" or false) || + (gdk-pixbuf."0.2.0"."v2_36" or false) || + (f."gdk-pixbuf"."0.2.0"."v2_36" or false); } + { "${deps.gdk-pixbuf."0.2.0".gdk_pixbuf_sys}".default = true; } ]; - glib."${deps.gdk_pixbuf."0.2.0".glib}".default = true; - glib_sys."${deps.gdk_pixbuf."0.2.0".glib_sys}".default = true; - gobject_sys."${deps.gdk_pixbuf."0.2.0".gobject_sys}".default = true; - libc."${deps.gdk_pixbuf."0.2.0".libc}".default = true; + glib."${deps.gdk-pixbuf."0.2.0".glib}".default = true; + glib_sys."${deps.gdk-pixbuf."0.2.0".glib_sys}".default = true; + gobject_sys."${deps.gdk-pixbuf."0.2.0".gobject_sys}".default = true; + libc."${deps.gdk-pixbuf."0.2.0".libc}".default = true; }) [ - (features_.gdk_pixbuf_sys."${deps."gdk_pixbuf"."0.2.0"."gdk_pixbuf_sys"}" deps) - (features_.glib."${deps."gdk_pixbuf"."0.2.0"."glib"}" deps) - (features_.glib_sys."${deps."gdk_pixbuf"."0.2.0"."glib_sys"}" deps) - (features_.gobject_sys."${deps."gdk_pixbuf"."0.2.0"."gobject_sys"}" deps) - (features_.libc."${deps."gdk_pixbuf"."0.2.0"."libc"}" deps) + (features_.gdk_pixbuf_sys."${deps."gdk-pixbuf"."0.2.0"."gdk_pixbuf_sys"}" deps) + (features_.glib."${deps."gdk-pixbuf"."0.2.0"."glib"}" deps) + (features_.glib_sys."${deps."gdk-pixbuf"."0.2.0"."glib_sys"}" deps) + (features_.gobject_sys."${deps."gdk-pixbuf"."0.2.0"."gobject_sys"}" deps) + (features_.libc."${deps."gdk-pixbuf"."0.2.0"."libc"}" deps) ]; @@ -2357,7 +2357,7 @@ rec { (crates."dbus"."${deps."way_cooler"."0.8.1"."dbus"}" deps) (crates."dbus_macros"."${deps."way_cooler"."0.8.1"."dbus_macros"}" deps) (crates."env_logger"."${deps."way_cooler"."0.8.1"."env_logger"}" deps) - (crates."gdk_pixbuf"."${deps."way_cooler"."0.8.1"."gdk_pixbuf"}" deps) + (crates."gdk-pixbuf"."${deps."way_cooler"."0.8.1"."gdk-pixbuf"}" deps) (crates."getopts"."${deps."way_cooler"."0.8.1"."getopts"}" deps) (crates."glib"."${deps."way_cooler"."0.8.1"."glib"}" deps) (crates."json_macro"."${deps."way_cooler"."0.8.1"."json_macro"}" deps) @@ -2386,7 +2386,7 @@ rec { dbus."${deps.way_cooler."0.8.1".dbus}".default = true; dbus_macros."${deps.way_cooler."0.8.1".dbus_macros}".default = true; env_logger."${deps.way_cooler."0.8.1".env_logger}".default = true; - gdk_pixbuf."${deps.way_cooler."0.8.1".gdk_pixbuf}".default = true; + gdk-pixbuf."${deps.way_cooler."0.8.1".gdk-pixbuf}".default = true; getopts."${deps.way_cooler."0.8.1".getopts}".default = true; glib."${deps.way_cooler."0.8.1".glib}".default = true; json_macro."${deps.way_cooler."0.8.1".json_macro}".default = true; @@ -2434,7 +2434,7 @@ rec { (features_.dbus."${deps."way_cooler"."0.8.1"."dbus"}" deps) (features_.dbus_macros."${deps."way_cooler"."0.8.1"."dbus_macros"}" deps) (features_.env_logger."${deps."way_cooler"."0.8.1"."env_logger"}" deps) - (features_.gdk_pixbuf."${deps."way_cooler"."0.8.1"."gdk_pixbuf"}" deps) + (features_.gdk-pixbuf."${deps."way_cooler"."0.8.1"."gdk-pixbuf"}" deps) (features_.getopts."${deps."way_cooler"."0.8.1"."getopts"}" deps) (features_.glib."${deps."way_cooler"."0.8.1"."glib"}" deps) (features_.json_macro."${deps."way_cooler"."0.8.1"."json_macro"}" deps) diff --git a/pkgs/applications/window-managers/way-cooler/default.nix b/pkgs/applications/window-managers/way-cooler/default.nix index 24320ff0073..f06020143d7 100644 --- a/pkgs/applications/window-managers/way-cooler/default.nix +++ b/pkgs/applications/window-managers/way-cooler/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, symlinkJoin, writeShellScriptBin, callPackage, defaultCrateOverrides -, wayland, wlc, cairo, libxkbcommon, pam, python3Packages, lemonbar, gdk_pixbuf +, wayland, wlc, cairo, libxkbcommon, pam, python3Packages, lemonbar, gdk-pixbuf }: let @@ -22,7 +22,7 @@ let way-cooler = ((way_cooler_ { builtin-lua = true; }).override { crateOverrides = defaultCrateOverrides // { - way-cooler = attrs: { buildInputs = [ wlc cairo libxkbcommon fakegit gdk_pixbuf wayland ]; }; + way-cooler = attrs: { buildInputs = [ wlc cairo libxkbcommon fakegit gdk-pixbuf wayland ]; }; };}).overrideAttrs (oldAttrs: rec { postBuild = '' mkdir -p $out/etc diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix index 6fc1797dd25..678ebad75dd 100644 --- a/pkgs/applications/window-managers/yabar/build.nix +++ b/pkgs/applications/window-managers/yabar/build.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cairo, gdk_pixbuf, libconfig, pango, pkgconfig +{ stdenv, fetchFromGitHub, cairo, gdk-pixbuf, libconfig, pango, pkgconfig , xcbutilwm, alsaLib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl , configFile ? null, lib , rev, sha256, version, patches ? [] @@ -20,7 +20,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cairo gdk_pixbuf libconfig pango xcbutilwm docbook_xsl + cairo gdk-pixbuf libconfig pango xcbutilwm docbook_xsl alsaLib wirelesstools asciidoc libxslt makeWrapper ]; |