swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-29 16:40:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3131 from bennofs/dwb-wrapper

Browse source 
add dwb-wrapper for plugin support
This commit is contained in:
Pascal Wittmann 2014-07-08 14:19:47 +02:00
parent b40055d6ec 52c8df4ad3
commit a1b27f9806
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/networking/browsers/dwb/default.nix
View file

@ -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" \

4
pkgs/top-level/all-packages.nix
View file

@ -8314,6 +8314,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 [];
};