diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-12-03 12:13:20 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-12-03 12:13:20 +0100 |
| commit | 077b7e5880628c12fe6a9ae0b10db848deb85b50 (patch) | |
| tree | 9916a5f30f8529893c0e17c5c2b6264d8b14dcce /pkgs/applications/window-managers | |
| parent | 28e2277305f8c6eeee3f6f773927b956eb903a15 (diff) | |
| parent | fb137c1bcc0b9569c1a76751f19a6d453f5df2c3 (diff) | |
| download | nixpkgs-077b7e5880628c12fe6a9ae0b10db848deb85b50.tar nixpkgs-077b7e5880628c12fe6a9ae0b10db848deb85b50.tar.gz nixpkgs-077b7e5880628c12fe6a9ae0b10db848deb85b50.tar.bz2 nixpkgs-077b7e5880628c12fe6a9ae0b10db848deb85b50.tar.lz nixpkgs-077b7e5880628c12fe6a9ae0b10db848deb85b50.tar.xz nixpkgs-077b7e5880628c12fe6a9ae0b10db848deb85b50.tar.zst nixpkgs-077b7e5880628c12fe6a9ae0b10db848deb85b50.zip | |
Merge staging into staging-next
Diffstat (limited to 'pkgs/applications/window-managers')
| -rw-r--r-- | pkgs/applications/window-managers/awesome/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/window-managers/i3/i3ipc-glib.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index c23284d0b52..8823daaa6d9 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkgconfig, gdk_pixbuf , xorg, libstartup_notification, libxdg_basedir, libpthreadstubs -, xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter +, xcb-util-cursor, makeWrapper, pango, gobject-introspection, unclutter , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm , which, dbus, nettools, git, asciidoc, doxygen , xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs @@ -30,7 +30,7 @@ with luaPackages; stdenv.mkDerivation rec { ]; propagatedUserEnvPkgs = [ hicolor-icon-theme ]; - buildInputs = [ cairo librsvg dbus gdk_pixbuf gobjectIntrospection + 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/i3/i3ipc-glib.nix b/pkgs/applications/window-managers/i3/i3ipc-glib.nix index 87e11774d43..6f709c999f4 100644 --- a/pkgs/applications/window-managers/i3/i3ipc-glib.nix +++ b/pkgs/applications/window-managers/i3/i3ipc-glib.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, xproto, libxcb , autoreconfHook, json-glib, gtk-doc, which -, gobjectIntrospection +, gobject-introspection }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook which pkgconfig ]; - buildInputs = [ libxcb json-glib gtk-doc xproto gobjectIntrospection ]; + buildInputs = [ libxcb json-glib gtk-doc xproto gobject-introspection ]; preAutoreconf = '' |