diff options
Diffstat (limited to 'pkgs/development')
51 files changed, 104 insertions, 104 deletions
diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index 4a7aedf97d38..f5b8b2e2059d 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -20,7 +20,7 @@ , makeWrapper , runCommandLocal , writeShellScript -, wrapGAppsHook +, wrapGAppsHook3 , git , which , pkg-config @@ -123,7 +123,7 @@ in nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ] - ++ lib.optionals supportsLinuxDesktopTarget [ glib wrapGAppsHook ]; + ++ lib.optionals supportsLinuxDesktopTarget [ glib wrapGAppsHook3 ]; passthru = flutter.passthru // { inherit (flutter) version; diff --git a/pkgs/development/coq-modules/coqide/default.nix b/pkgs/development/coq-modules/coqide/default.nix index d2dda145f677..449e81040dfa 100644 --- a/pkgs/development/coq-modules/coqide/default.nix +++ b/pkgs/development/coq-modules/coqide/default.nix @@ -1,7 +1,7 @@ { lib , makeDesktopItem , copyDesktopItems -, wrapGAppsHook +, wrapGAppsHook3 , glib , gnome , mkCoqDerivation @@ -26,7 +26,7 @@ mkCoqDerivation rec { buildInputs = [ copyDesktopItems - wrapGAppsHook + wrapGAppsHook3 coq.ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme diff --git a/pkgs/development/coq-modules/vscoq-language-server/default.nix b/pkgs/development/coq-modules/vscoq-language-server/default.nix index ee74d77101e7..e79bd4f60f8d 100644 --- a/pkgs/development/coq-modules/vscoq-language-server/default.nix +++ b/pkgs/development/coq-modules/vscoq-language-server/default.nix @@ -1,4 +1,4 @@ -{ metaFetch, mkCoqDerivation, coq, lib, glib, gnome, wrapGAppsHook, +{ metaFetch, mkCoqDerivation, coq, lib, glib, gnome, wrapGAppsHook3, version ? null }: let ocamlPackages = coq.ocamlPackages; @@ -21,7 +21,7 @@ ocamlPackages.buildDunePackage { src = "${fetched.src}/language-server"; nativeBuildInputs = [ coq ]; buildInputs = - [ coq glib gnome.adwaita-icon-theme wrapGAppsHook ] ++ + [ coq glib gnome.adwaita-icon-theme wrapGAppsHook3 ] ++ (with ocamlPackages; [ findlib lablgtk3-sourceview3 yojson zarith ppx_inline_test ppx_assert ppx_sexp_conv ppx_deriving ppx_import sexplib diff --git a/pkgs/development/embedded/arduino/arduino-core/default.nix b/pkgs/development/embedded/arduino/arduino-core/default.nix index e82396669787..965985339057 100644 --- a/pkgs/development/embedded/arduino/arduino-core/default.nix +++ b/pkgs/development/embedded/arduino/arduino-core/default.nix @@ -12,7 +12,7 @@ , readline , withGui ? false , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , withTeensyduino ? false /* Packages needed for Teensyduino */ , upx @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { # the glib setup hook will populate GSETTINGS_SCHEMAS_PATH, # wrapGAppHooks (among other things) adds it to XDG_DATA_DIRS # so 'save as...' works: - nativeBuildInputs = [ glib wrapGAppsHook unzip ]; + nativeBuildInputs = [ glib wrapGAppsHook3 unzip ]; buildInputs = [ jdk ant diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 72cc9c4c85a9..654130dd00e9 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -444,7 +444,7 @@ self: super: builtins.intersectAttrs super { leksah = dontCheck (overrideCabal (drv: { executableSystemDepends = (drv.executableSystemDepends or []) ++ (with pkgs; [ gnome.adwaita-icon-theme # Fix error: Icon 'window-close' not present in theme ... - wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system + wrapGAppsHook3 # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed ]); postPatch = (drv.postPatch or "") + '' diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 32d1466f326e..2f3b6de7d11c 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -29,7 +29,7 @@ , common-updater-scripts , coreutils , git -, wrapGAppsHook +, wrapGAppsHook3 }: { baseName ? "erlang" , version @@ -46,7 +46,7 @@ , odbcSupport ? false , odbcPackages ? [ unixODBC ] , opensslPackage ? openssl -, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 wrapGAppsHook ] +, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 wrapGAppsHook3 ] , preUnpack ? "" , postUnpack ? "" , patches ? [ ] diff --git a/pkgs/development/interpreters/gnudatalanguage/default.nix b/pkgs/development/interpreters/gnudatalanguage/default.nix index 54b5c5898c87..41f15afbee30 100644 --- a/pkgs/development/interpreters/gnudatalanguage/default.nix +++ b/pkgs/development/interpreters/gnudatalanguage/default.nix @@ -2,7 +2,7 @@ , lib , fetchFromGitHub , cmake -, wrapGAppsHook +, wrapGAppsHook3 , readline , ncurses , zlib @@ -157,7 +157,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - ] ++ lib.optional enableWX wrapGAppsHook; + ] ++ lib.optional enableWX wrapGAppsHook3; cmakeFlags = lib.optional (!enableHDF4) "-DHDF=OFF" ++ [ (if enableHDF5 then "-DHDF5DIR=${hdf5-custom}" else "-DHDF5=OFF") ] diff --git a/pkgs/development/interpreters/gtk-server/default.nix b/pkgs/development/interpreters/gtk-server/default.nix index e6d32f40c40e..d97c94fbd885 100644 --- a/pkgs/development/interpreters/gtk-server/default.nix +++ b/pkgs/development/interpreters/gtk-server/default.nix @@ -5,7 +5,7 @@ , gtk3 , libffcall , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cd src ''; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ libffcall glib gtk3 ]; configureOptions = [ "--with-gtk3" ]; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 8d4615f61cea..f75470566e2c 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -15,7 +15,7 @@ , disableDocs ? false , CoreFoundation , gsettings-desktop-schemas -, wrapGAppsHook +, wrapGAppsHook3 }: let @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { (lib.optionalString (stdenv.cc.isGNU && ! stdenv.isDarwin) "-lgcc_s") ]; - nativeBuildInputs = [ cacert wrapGAppsHook ]; + nativeBuildInputs = [ cacert wrapGAppsHook3 ]; buildInputs = [ fontconfig libffi libtool sqlite gsettings-desktop-schemas gtk3 ncurses ] ++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ]; diff --git a/pkgs/development/interpreters/racket/racket_7_9.nix b/pkgs/development/interpreters/racket/racket_7_9.nix index 836bc879dbbc..78efe8e2914c 100644 --- a/pkgs/development/interpreters/racket/racket_7_9.nix +++ b/pkgs/development/interpreters/racket/racket_7_9.nix @@ -13,7 +13,7 @@ , disableDocs ? false , CoreFoundation , gsettings-desktop-schemas -, wrapGAppsHook +, wrapGAppsHook3 }: let @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { (lib.optionalString stdenv.isDarwin "-framework CoreFoundation") ]; - nativeBuildInputs = [ cacert wrapGAppsHook ]; + nativeBuildInputs = [ cacert wrapGAppsHook3 ]; buildInputs = [ fontconfig libffi libtool sqlite gsettings-desktop-schemas gtk3 ] ++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ]; diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix index ccdc06e906fe..e279a6d6e369 100644 --- a/pkgs/development/libraries/aravis/default.nix +++ b/pkgs/development/libraries/aravis/default.nix @@ -13,7 +13,7 @@ , enableViewer ? true , gst_all_1 , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , enableUsb ? true , libusb1 @@ -25,7 +25,7 @@ assert enableGstPlugin -> gst_all_1 != null; assert enableViewer -> enableGstPlugin; assert enableViewer -> gtk3 != null; -assert enableViewer -> wrapGAppsHook != null; +assert enableViewer -> wrapGAppsHook3 != null; stdenv.mkDerivation rec { pname = "aravis"; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { pkg-config gi-docgen gobject-introspection - ] ++ lib.optional enableViewer wrapGAppsHook; + ] ++ lib.optional enableViewer wrapGAppsHook3; buildInputs = [ glib libxml2 ] diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index 99c1df8e0a39..8b1195442963 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -17,7 +17,7 @@ , xorgserver , dbus , python3 -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { pkg-config vala which - wrapGAppsHook + wrapGAppsHook3 xorgserver ]; diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index 5a388246c154..e8196ca1f67b 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -16,7 +16,7 @@ , openssh , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , gi-docgen , vala , gnome @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { gettext gobject-introspection gi-docgen - wrapGAppsHook + wrapGAppsHook3 vala shared-mime-info gnupg diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index 17ef806ec9ad..9f1cc784e140 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl , pkg-config , python3Packages -, wrapGAppsHook +, wrapGAppsHook3 , atk , dbus , evemu @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { pythonPath = with python3Packages; [ pygobject3 ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook python3Packages.wrapPython gobject-introspection ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 python3Packages.wrapPython gobject-introspection ]; buildInputs = [ atk dbus evemu frame gdk-pixbuf grail gtk3 xorg.libX11 xorg.libXext xorg.libXi xorg.libXtst pango python3Packages.python xorgserver ]; diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index c2bf28d71045..df58e5dc9e19 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -19,7 +19,7 @@ , avahi , glib-networking , python3 -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection , vala , withDemoAgent ? false @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { intltool meson ninja - wrapGAppsHook + wrapGAppsHook3 python3 vala gobject-introspection diff --git a/pkgs/development/libraries/gstreamer/viperfx/default.nix b/pkgs/development/libraries/gstreamer/viperfx/default.nix index 83c7d75e98c1..0f8e8914e2e9 100644 --- a/pkgs/development/libraries/gstreamer/viperfx/default.nix +++ b/pkgs/development/libraries/gstreamer/viperfx/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gst_all_1 , cmake }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-0so4jV56nl3tZHuZpvtyMrpOZ4tNJ59Pyj6zbV5bJ5Y="; }; - nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 ]; propagatedBuildInputs = [ gst_all_1.gstreamer diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 48ffb0398f61..aba944becf76 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -32,7 +32,7 @@ , gcr_4 , glib-networking , gnome-online-accounts -, wrapGAppsHook +, wrapGAppsHook3 , libimobiledevice , libbluray , libcdio-paranoia @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { python3 pkg-config gettext - wrapGAppsHook + wrapGAppsHook3 libxslt docbook_xsl docbook_xml_dtd_42 diff --git a/pkgs/development/libraries/kde-frameworks/kded.nix b/pkgs/development/libraries/kde-frameworks/kded.nix index 02364ba72f36..e369b8fbae41 100644 --- a/pkgs/development/libraries/kde-frameworks/kded.nix +++ b/pkgs/development/libraries/kde-frameworks/kded.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, propagate, wrapGAppsHook, + mkDerivation, lib, propagate, wrapGAppsHook3, extra-cmake-modules, kdoctools, gsettings-desktop-schemas, kconfig, kcoreaddons, kcrash, kdbusaddons, kservice, qtbase, @@ -7,7 +7,7 @@ mkDerivation { pname = "kded"; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook3 ]; buildInputs = [ gsettings-desktop-schemas kconfig kcoreaddons kcrash kdbusaddons kservice qtbase diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/pkgs/development/libraries/libgnomekbd/default.nix index fc9924b50834..a5c278956f2d 100644 --- a/pkgs/development/libraries/libgnomekbd/default.nix +++ b/pkgs/development/libraries/libgnomekbd/default.nix @@ -8,7 +8,7 @@ , glib , gtk3 , libxklavier -, wrapGAppsHook +, wrapGAppsHook3 , gnome }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 glib gobject-introspection ]; diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index f9d8be93c66c..26b9f44f5080 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -13,7 +13,7 @@ , gobject-introspection , python3 , ncurses -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { gettext gi-docgen gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index d160a6a5f6dc..fd7428213fc9 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -36,7 +36,7 @@ , wayland-protocols , wayland-scanner , zlib -, wrapGAppsHook +, wrapGAppsHook3 , withPolkit ? stdenv.isLinux }: @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { python3.pkgs.pyparsing python3.pkgs.six vala - wrapGAppsHook + wrapGAppsHook3 ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ mesonEmulatorHook ] ++ lib.optionals stdenv.isLinux [ diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index e44ffe1ec1d2..e1a51284927a 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -9,7 +9,7 @@ , gnome , gnome-desktop , glib -, wrapGAppsHook +, wrapGAppsHook3 , gsettings-desktop-schemas , buildPortalsInGnome ? true }: @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix index e2d12c250171..d614627a0749 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix @@ -4,7 +4,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , cinnamon , glib , gsettings-desktop-schemas @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/de |