diff options
| author | Patryk Niedźwiedziński <pniedzwiedzinski19@gmail.com> | 2020-09-28 09:47:18 +0200 |
|---|---|---|
| committer | Patryk Niedźwiedziński <pniedzwiedzinski19@gmail.com> | 2020-09-28 09:47:18 +0200 |
| commit | ee54c309daab7ffac0d987fed3626570c26c678a (patch) | |
| tree | 4f90f1ed62dc5474b8634d51af2e75e0d316c322 | |
| parent | 2b76c3213a10a1658fb17e7fe05cfe3c64a9a560 (diff) | |
| download | pnpkgs-ee54c309daab7ffac0d987fed3626570c26c678a.tar.gz pnpkgs-ee54c309daab7ffac0d987fed3626570c26c678a.zip | |
Add libXext to dwm
| -rw-r--r-- | pkgs/dwm/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/dwm/pndwm.nix | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/dwm/default.nix b/pkgs/dwm/default.nix index 0f8eed4..57ef1dc 100644 --- a/pkgs/dwm/default.nix +++ b/pkgs/dwm/default.nix @@ -1,9 +1,10 @@ -{ stdenv, fetchgit, libX11, libXinerama, libXft, libXext, patches ? [] }: +{ stdenv, fetchgit, libX11, libXinerama, libXft, xlibs, patches ? [] }: with stdenv.lib; stdenv.mkDerivation rec { name = "dwm"; + version = "1.0"; src = fetchgit { url = "https://github.com/LukeSmithXYZ/dwm"; @@ -11,13 +12,13 @@ stdenv.mkDerivation rec { sha256 = "1fi0q68zqcmnx4spvjaqlv0k43ij96bz3545qdlc077qhzw2lxxh"; }; - buildInputs = [ libX11 libXinerama libXft libXext ]; + buildInputs = [ libX11 libXinerama libXft xlibs.libXext.dev ]; prePatch = ''sed -i "s@/usr/local@$out@" config.mk''; inherit patches; - buildPhase = " make "; + buildPhase = ''make LDFLAGS="-L/usr/X11R6/lib -lX11 -lXinerama -lfontconfig -lXft -lX11-xcb -lxcb -lxcb-res -lXext"''; meta = { homepage = "https://github.com/LukeSmithXYZ/dwm"; diff --git a/pkgs/dwm/pndwm.nix b/pkgs/dwm/pndwm.nix index a4aa6f2..7917c09 100644 --- a/pkgs/dwm/pndwm.nix +++ b/pkgs/dwm/pndwm.nix @@ -6,7 +6,7 @@ let ./dwm-center.diff ./dwm-apps.diff ./dwm-autostart.diff - # ./dwm-rounded.diff + ./dwm-rounded.diff ]; }; in |