diff options
Diffstat (limited to 'pkgs/tools/misc')
31 files changed, 63 insertions, 63 deletions
diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/tools/misc/alarm-clock-applet/default.nix index 525d65dd7e08a..85feb80700e6e 100644 --- a/pkgs/tools/misc/alarm-clock-applet/default.nix +++ b/pkgs/tools/misc/alarm-clock-applet/default.nix @@ -4,7 +4,7 @@ , fetchpatch , cmake , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gst_all_1 , libnotify , libayatana-appindicator @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/tools/misc/archi/default.nix b/pkgs/tools/misc/archi/default.nix index 23c5372e5eef6..b7d9f6b92293d 100644 --- a/pkgs/tools/misc/archi/default.nix +++ b/pkgs/tools/misc/archi/default.nix @@ -5,7 +5,7 @@ , jdk , libsecret , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 , _7zz , nixosTests }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper - wrapGAppsHook + wrapGAppsHook3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ _7zz ] ++ lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix index aa8e9ac6a9e86..731eeb0513358 100644 --- a/pkgs/tools/misc/birdfont/default.nix +++ b/pkgs/tools/misc/birdfont/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, python3, xmlbird, cairo, gdk-pixbuf, libgee, glib, gtk3, webkitgtk, libnotify, sqlite, vala, -gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook, autoPatchelfHook }: +gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook3, autoPatchelfHook }: stdenv.mkDerivation rec { pname = "birdfont"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-NNw7203BtHhNyyQezb3/EP98cTsu7ABDFBnM5Ms2ePY="; }; - nativeBuildInputs = [ python3 pkg-config vala gobject-introspection wrapGAppsHook autoPatchelfHook ]; + nativeBuildInputs = [ python3 pkg-config vala gobject-introspection wrapGAppsHook3 autoPatchelfHook ]; buildInputs = [ xmlbird libgee cairo gdk-pixbuf glib gtk3 webkitgtk libnotify sqlite gsettings-desktop-schemas ]; postPatch = '' diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix index cad2c45063746..5c9c2cd1054ca 100644 --- a/pkgs/tools/misc/clipster/default.nix +++ b/pkgs/tools/misc/clipster/default.nix @@ -1,5 +1,5 @@ {fetchFromGitHub , lib, stdenv, python3, gtk3, libwnck, - gobject-introspection, wrapGAppsHook }: + gobject-introspection, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "clipster"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]); nativeBuildInputs = [ gobject-introspection ]; - buildInputs = [ pythonEnv gtk3 libwnck wrapGAppsHook ]; + buildInputs = [ pythonEnv gtk3 libwnck wrapGAppsHook3 ]; installPhase = '' sed -i 's/python/python3/g' clipster diff --git a/pkgs/tools/misc/fsearch/default.nix b/pkgs/tools/misc/fsearch/default.nix index a9e3b6caa3526..933daaf3df51a 100644 --- a/pkgs/tools/misc/fsearch/default.nix +++ b/pkgs/tools/misc/fsearch/default.nix @@ -8,7 +8,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gettext , icu }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 gettext ]; diff --git a/pkgs/tools/misc/gaphor/default.nix b/pkgs/tools/misc/gaphor/default.nix index 48f9fa7a7bba9..a8afdef6a2bff 100644 --- a/pkgs/tools/misc/gaphor/default.nix +++ b/pkgs/tools/misc/gaphor/default.nix @@ -4,7 +4,7 @@ , copyDesktopItems , gobject-introspection , poetry-core -, wrapGAppsHook +, wrapGAppsHook3 , gtksourceview4 , pango , gaphas @@ -34,7 +34,7 @@ buildPythonApplication rec { copyDesktopItems gobject-introspection poetry-core - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -59,7 +59,7 @@ buildPythonApplication rec { desktopName = "Gaphor"; }; - # Disable automatic wrapGAppsHook to prevent double wrapping + # Disable automatic wrapGAppsHook3 to prevent double wrapping dontWrapGApps = true; postInstall = '' diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 7c068656385df..d12babfddfafd 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, gettext, coreutils, gnused, gnome , gnugrep, parted, glib, libuuid, pkg-config, gtkmm3, libxml2 -, gpart, hdparm, procps, util-linux, polkit, wrapGAppsHook, substituteAll +, gpart, hdparm, procps, util-linux, polkit, wrapGAppsHook3, substituteAll , mtools, dosfstools }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-doc" ]; buildInputs = [ parted glib libuuid gtkmm3 libxml2 polkit.bin gnome.adwaita-icon-theme ]; - nativeBuildInputs = [ gettext pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ gettext pkg-config wrapGAppsHook3 ]; preConfigure = '' # For ITS rules diff --git a/pkgs/tools/misc/gpick/default.nix b/pkgs/tools/misc/gpick/default.nix index 0d421212a3d44..c21759b00fea2 100644 --- a/pkgs/tools/misc/gpick/default.nix +++ b/pkgs/tools/misc/gpick/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , cmake -, wrapGAppsHook +, wrapGAppsHook3 , boost , pkg-config , gtk3 @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 ]; buildInputs = [ boost gtk3 ragel lua ]; meta = with lib; { diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix index a1c163f6784e8..2b5878f7a638e 100644 --- a/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/pkgs/tools/misc/gsmartcontrol/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkg-config, wrapGAppsHook, pcre-cpp, gnome }: +{ fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkg-config, wrapGAppsHook3, pcre-cpp, gnome }: stdenv.mkDerivation rec { pname = "gsmartcontrol"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { substituteInPlace data/org.gsmartcontrol.policy --replace "/usr/sbin" $out/bin ''; - nativeBuildInputs = [ autoreconfHook gettext pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook gettext pkg-config wrapGAppsHook3 ]; buildInputs = [ gtkmm3 pcre-cpp gnome.adwaita-icon-theme ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/gtkterm/default.nix b/pkgs/tools/misc/gtkterm/default.nix index 85636afb9d380..ebd7ec388764e 100644 --- a/pkgs/tools/misc/gtkterm/default.nix +++ b/pkgs/tools/misc/gtkterm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, gtk3, vte, libgudev, wrapGAppsHook, pcre2 }: +{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, gtk3, vte, libgudev, wrapGAppsHook3, pcre2 }: stdenv.mkDerivation rec { pname = "gtkterm"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/tools/misc/gwe/default.nix b/pkgs/tools/misc/gwe/default.nix index d889230ed228d..5f2c29c644d97 100644 --- a/pkgs/tools/misc/gwe/default.nix +++ b/pkgs/tools/misc/gwe/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitLab -, wrapGAppsHook +, wrapGAppsHook3 , pkg-config , meson , ninja @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 pkg-config meson ninja diff --git a/pkgs/tools/misc/hakuneko/default.nix b/pkgs/tools/misc/hakuneko/default.nix index 0359da603ccbb..fbc76aa1eb90b 100644 --- a/pkgs/tools/misc/hakuneko/default.nix +++ b/pkgs/tools/misc/hakuneko/default.nix @@ -6,7 +6,7 @@ , udev , stdenv , lib -, wrapGAppsHook +, wrapGAppsHook3 , alsa-lib , nss , nspr @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { autoPatchelfHook dpkg makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/tools/misc/hashit/default.nix b/pkgs/tools/misc/hashit/default.nix index a7bcde7ab5fca..ecd7aaf5cdcc4 100644 --- a/pkgs/tools/misc/hashit/default.nix +++ b/pkgs/tools/misc/hashit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkg-config, vala, pantheon, python3, libgee, gtk3, desktop-file-utils, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkg-config, vala, pantheon, python3, libgee, gtk3, desktop-file-utils, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "hashit"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { vala pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/tools/misc/jugglinglab/default.nix b/pkgs/tools/misc/jugglinglab/default.nix index 64b91a68d9480..ee2f4cbfc7e5e 100644 --- a/pkgs/tools/misc/jugglinglab/default.nix +++ b/pkgs/tools/misc/jugglinglab/default.nix @@ -3,7 +3,7 @@ , maven , fetchFromGitHub , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 , jre }: @@ -38,7 +38,7 @@ maven.buildMavenPackage rec { nativeBuildInputs = [ makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; dontWrapGApps = true; diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index e0c1097d183f0..6df35c2ea734f 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -28,7 +28,7 @@ nss, pango, stdenv, systemd, -wrapGAppsHook, +wrapGAppsHook3, xorg, }: @@ -95,7 +95,7 @@ in stdenv.mkDerivation { inherit src; - buildInputs = [ dpkg wrapGAppsHook gtk3 ]; + buildInputs = [ dpkg wrapGAppsHook3 gtk3 ]; dontUnpack = true; buildCommand = '' diff --git a/pkgs/tools/misc/nautilus-open-any-terminal/default.nix b/pkgs/tools/misc/nautilus-open-any-terminal/default.nix index b200731ab8f24..45716202878ff 100644 --- a/pkgs/tools/misc/nautilus-open-any-terminal/default.nix +++ b/pkgs/tools/misc/nautilus-open-any-terminal/default.nix @@ -9,7 +9,7 @@ , gsettings-desktop-schemas , gtk3 , python3 -, wrapGAppsHook +, wrapGAppsHook3 }: python3.pkgs.buildPythonPackage rec { @@ -30,7 +30,7 @@ python3.pkgs.buildPythonPackage rec { glib gobject-introspection pkg-config - wrapGAppsHook + wrapGAppsHook3 python3.pkgs.setuptools ]; diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index d39115fcecc9a..3c53be706641b 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook , gtk2, hicolor-icon-theme, intltool, pkg-config -, which, wrapGAppsHook, xdotool, libappindicator-gtk2 }: +, which, wrapGAppsHook3, xdotool, libappindicator-gtk2 }: stdenv.mkDerivation rec { pname = "parcellite"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "19q4x6x984s6gxk1wpzaxawgvly5vnihivrhmja2kcxhzqrnfhiy"; }; - nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook3 ]; buildInputs = [ gtk2 hicolor-icon-theme libappindicator-gtk2 ]; NIX_LDFLAGS = "-lgio-2.0"; diff --git a/pkgs/tools/misc/plotinus/default.nix b/pkgs/tools/misc/plotinus/default.nix index 112010c80082f..10c86b10c3da7 100644 --- a/pkgs/tools/misc/plotinus/default.nix +++ b/pkgs/tools/misc/plotinus/default.nix @@ -7,7 +7,7 @@ , cmake , ninja , vala -, wrapGAppsHook }: +, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "plotinus"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook3 vala cmake ninja diff --git a/pkgs/tools/misc/popsicle/default.nix b/pkgs/tools/misc/popsicle/default.nix index c5a9e5edc7389..2a62a0aa922dc 100644 --- a/pkgs/tools/misc/popsicle/default.nix +++ b/pkgs/tools/misc/popsicle/default.nix @@ -6,7 +6,7 @@ , glib , pkg-config , rustc -, wrapGAppsHook +, wrapGAppsHook3 , gdk-pixbuf , gtk3 }: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { rustPlatform.bindgenHook rustPlatform.cargoSetupHook rustc - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/tools/misc/qflipper/default.nix b/pkgs/tools/misc/qflipper/default.nix index 5c139d017c864..171c5d7b38775 100644 --- a/pkgs/tools/misc/qflipper/default.nix +++ b/pkgs/tools/misc/qflipper/default.nix @@ -6,7 +6,7 @@ , libusb1 , libGL , qmake -, wrapGAppsHook +, wrapGAppsHook3 , wrapQtAppsHook , mkDerivation @@ -45,7 +45,7 @@ mkDerivation { pkg-config qmake qttools - wrapGAppsHook + wrapGAppsHook3 wrapQtAppsHook ]; diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 2c11cbf195bd2..08a0a0c5e1460 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -14,7 +14,7 @@ , scons , sphinx , util-linux -, wrapGAppsHook +, wrapGAppsHook3 , withGui ? false }: assert withGui -> !stdenv.isDarwin; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { scons ] ++ lib.optionals withGui [ makeWrapper - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/tools/misc/scanmem/default.nix b/pkgs/tools/misc/scanmem/default.nix index 817e713b229ff..15d8f1c02f1ec 100644 --- a/pkgs/tools/misc/scanmem/default.nix +++ b/pkgs/tools/misc/scanmem/default.nix @@ -4,7 +4,7 @@ , autoreconfHook , gobject-introspection , intltool -, wrapGAppsHook +, wrapGAppsHook3 , procps , python3 , readline @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sha256 = "17p8sh0rj8yqz36ria5bp48c8523zzw3y9g8sbm2jwq7sc27i7s9"; }; - nativeBuildInputs = [ autoreconfHook gobject-introspection intltool wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook gobject-introspection intltool wrapGAppsHook3 ]; buildInputs = [ readline python3 ]; configureFlags = ["--enable-gui"]; diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix index a6497a62f59b6..036f47965b8f8 100644 --- a/pkgs/tools/misc/staruml/default.nix +++ b/pkgs/tools/misc/staruml/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl -, dpkg, wrapGAppsHook +, dpkg, wrapGAppsHook3 , hicolor-icon-theme , gtk3, glib, systemd , xorg, nss, nspr @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-ULdrAQCiQlTN+aRhETj+ASMKkKctFgC2AfvUHGc6stU="; }; - nativeBuildInputs = [ wrapGAppsHook dpkg ]; + nativeBuildInputs = [ wrapGAppsHook3 dpkg ]; buildInputs = [ glib hicolor-icon-theme ]; unpackPhase = '' diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index cafc35790193c..8778327b0e876 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, udev, pkg-config, glib, xmlto, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, udev, pkg-config, glib, xmlto, wrapGAppsHook3 , docbook_xml_dtd_412, docbook_xsl , libxml2, desktop-file-utils, libusb1, cups, gdk-pixbuf, pango, atk, libnotify , gobject-introspection, libsecret, packagekit @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { pkg-config gettext libtool autoconf-archive xmlto libxml2 docbook_xml_dtd_412 docbook_xsl desktop-file-utils python3Packages.wrapPython - wrapGAppsHook autoreconfHook gobject-introspection + wrapGAppsHook3 autoreconfHook gobject-introspection ]; pythonPath = with python3Packages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 pycairo pysmbc ]; diff --git a/pkgs/tools/misc/trackma/default.nix b/pkgs/tools/misc/trackma/default.nix index 86834e337d8c4..c57d5ac1d7572 100644 --- a/pkgs/tools/misc/trackma/default.nix +++ b/pkgs/tools/misc/trackma/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , python3 -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection , glib , gtk3 @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ copyDesktopItems python3.pkgs.poetry-core ] - ++ lib.optionals withGTK [ wrapGAppsHook gobject-introspection ] + ++ lib.optionals withGTK [ wrapGAppsHook3 gobject-introspection ] ++ lib.optionals withQT [ qt5.wrapQtAppsHook ]; buildInputs = lib.optionals withGTK [ glib gtk3 ]; diff --git a/pkgs/tools/misc/urn-timer/default.nix b/pkgs/tools/misc/urn-timer/default.nix index df45524a8a060..0b75657fb121d 100644 --- a/pkgs/tools/misc/urn-timer/default.nix +++ b/pkgs/tools/misc/urn-timer/default.nix @@ -4,7 +4,7 @@ , xxd , pkg-config , imagemagick -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , jansson , nixosTests @@ -25,7 +25,7 @@ stdenv.mkDerivation { xxd pkg-config imagemagick - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/tools/misc/usbimager/default.nix b/pkgs/tools/misc/usbimager/default.nix index b845062c1783e..898b5f1a4c853 100644 --- a/pkgs/tools/misc/usbimager/default.nix +++ b/pkgs/tools/misc/usbimager/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, pkg-config, wrapGAppsHook +{ lib, stdenv, fetchFromGitLab, pkg-config, wrapGAppsHook3 , withLibui ? true, gtk3 , withUdisks ? stdenv.isLinux, udisks, glib , libX11 }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sourceRoot = "${src.name}/src"; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = lib.optionals withUdisks [ udisks glib ] ++ lib.optional (!withLibui) libX11 ++ lib.optional withLibui gtk3; diff --git a/pkgs/tools/misc/woeusb-ng/default.nix b/pkgs/tools/misc/woeusb-ng/default.nix index 821eb73a4a896..1c3754bd95f3c 100644 --- a/pkgs/tools/misc/woeusb-ng/default.nix +++ b/pkgs/tools/misc/woeusb-ng/default.nix @@ -1,7 +1,7 @@ { lib , python3Packages , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook3 , p7zip , parted , grub2 @@ -27,7 +27,7 @@ buildPythonApplication rec { ''; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 ]; propagatedBuildInputs = [ diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index 7201ffcbbe998..333da375d5801 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , pkg-config }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ gtk3 diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix index a9ec5d5d0eeb7..97ad6dbaaecd4 100644 --- a/pkgs/tools/misc/xflux/gui.nix +++ b/pkgs/tools/misc/xflux/gui.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildPythonApplication, python3Packages, wrapGAppsHook +{ lib, fetchFromGitHub, buildPythonApplication, python3Packages, wrapGAppsHook3 , xflux, gtk3, gobject-introspection, pango, gdk-pixbuf, atk , pexpect, pygobject3, pyxdg, libappindicator-gtk3 }: @@ -24,7 +24,7 @@ buildPythonApplication rec { ]; nativeBuildInputs = [ - wrapGAppsHook gobject-introspection + wrapGAppsHook3 gobject-introspection pango gdk-pixbuf atk libappindicator-gtk3 ]; diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix index 9bbb955f1a1bc..7b578d479758f 100644 --- a/pkgs/tools/misc/yad/default.nix +++ b/pkgs/tools/misc/yad/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, autoreconfHook, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, autoreconfHook, wrapGAppsHook3 , gtk3, hicolor-icon-theme, netpbm }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 hicolor-icon-theme ]; - nativeBuildInputs = [ autoreconfHook pkg-config intltool wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config intltool wrapGAppsHook3 ]; postPatch = '' sed -i src/file.c -e '21i#include <glib/gprintf.h>' |