diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-07-30 00:12:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-30 00:12:46 +0100 |
| commit | a5e8ef5a744e31a0f2c2069aafd47acf015d97ed (patch) | |
| tree | eb20c7bca5b403405faad146e067661145173981 /pkgs/applications | |
| parent | bc8b634072f77149a6441f9f448cdcecc915bb6c (diff) | |
| parent | 47689bf70627c1f6ca74d79ee6a176f8aabece97 (diff) | |
| download | nixlib-a5e8ef5a744e31a0f2c2069aafd47acf015d97ed.tar nixlib-a5e8ef5a744e31a0f2c2069aafd47acf015d97ed.tar.gz nixlib-a5e8ef5a744e31a0f2c2069aafd47acf015d97ed.tar.bz2 nixlib-a5e8ef5a744e31a0f2c2069aafd47acf015d97ed.tar.lz nixlib-a5e8ef5a744e31a0f2c2069aafd47acf015d97ed.tar.xz nixlib-a5e8ef5a744e31a0f2c2069aafd47acf015d97ed.tar.zst nixlib-a5e8ef5a744e31a0f2c2069aafd47acf015d97ed.zip | |
Merge pull request #27739 from romildo/upd.awesome
awesome: 4.1 -> 4.2
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/window-managers/awesome/default.nix | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 6f56ff98998f..a441de5ed19f 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkgconfig, gdk_pixbuf +{ stdenv, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkgconfig, gdk_pixbuf , xorg, libstartup_notification, libxdg_basedir, libpthreadstubs , xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm @@ -9,13 +9,13 @@ with luaPackages; stdenv.mkDerivation rec { name = "awesome-${version}"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "awesomewm"; repo = "awesome"; rev = "v${version}"; - sha256 = "1qik8h5nwjq4535lpdpal85vas1k7am3s6l5r763kpdzxhfcyyaj"; + sha256 = "1pcgagcvm6rdky8p8dd810j3ywaz0ncyk5xgaykslaixzrq60kff"; }; nativeBuildInputs = [ @@ -38,13 +38,6 @@ with luaPackages; stdenv.mkDerivation rec { xorg.xcbutilrenderutil xorg.xcbutilwm libxkbcommon xcbutilxrm ]; - patches = [ - (fetchurl { - url = "https://patch-diff.githubusercontent.com/raw/awesomeWM/awesome/pull/1639.patch"; - sha256 = "00piynmbxajd2xbg960gmf0zlqn7m489f4ww482y49ravfy1jhsj"; - }) - ]; - #cmakeFlags = "-DGENERATE_MANPAGES=ON"; LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ cairo pango gobjectIntrospection ]}"; |