diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix index 855593ec11d6..438710f10245 100644 --- a/pkgs/applications/networking/browsers/dwb/default.nix +++ b/pkgs/applications/networking/browsers/dwb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, makeWrapper, libsoup, webkit, gtk3, gnutls, json_c, +{ stdenv, fetchgit, pkgconfig, makeWrapper, libsoup, webkitgtk2, gtk2, gnutls, json_c, m4, glib_networking, gsettings_desktop_schemas, dconf }: stdenv.mkDerivation { @@ -10,12 +10,10 @@ stdenv.mkDerivation { sha256 = "04p9frsnh1qz067cw36anvr41an789fba839svdjrdva0f2751g8"; }; - buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup webkit gtk3 gnutls json_c m4 ]; + buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup webkitgtk2 gtk2 gnutls json_c m4 ]; # There are Xlib and gtk warnings therefore I have set Wno-error - preBuild='' - makeFlagsArray=(CPPFLAGS="-Wno-error" GTK=3 PREFIX=$out); - ''; + makeFlags = ''PREFIX=$(out) GTK=2 CPPFLAGS="-Wno-error"''; preFixup='' wrapProgram "$out/bin/dwb" \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 599dcc426194..1f7ad111fb15 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8307,6 +8307,10 @@ let dwb = callPackage ../applications/networking/browsers/dwb { dconf = gnome3.dconf; }; + dwbWrapper = wrapFirefox + { browser = dwb; browserName = "dwb"; desktopName = "dwb"; + }; + dwm = callPackage ../applications/window-managers/dwm { patches = config.dwm.patches or []; };