diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-09-11 19:30:08 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-11 19:30:08 +0100 |
commit | 9d608f5ae95bf848378debc497cdf5a7af6f96c7 (patch) | |
tree | 9ba3cb516715c5c46f09b88050ad2ebc7fdf172f | |
parent | 124b3c8eadf2d97c77d50121d1a884b59ec041b7 (diff) | |
parent | 301ab39213d25d42a355421c9c441aac3a87e836 (diff) | |
download | nixpkgs-9d608f5ae95bf848378debc497cdf5a7af6f96c7.tar nixpkgs-9d608f5ae95bf848378debc497cdf5a7af6f96c7.tar.gz nixpkgs-9d608f5ae95bf848378debc497cdf5a7af6f96c7.tar.bz2 nixpkgs-9d608f5ae95bf848378debc497cdf5a7af6f96c7.tar.lz nixpkgs-9d608f5ae95bf848378debc497cdf5a7af6f96c7.tar.xz nixpkgs-9d608f5ae95bf848378debc497cdf5a7af6f96c7.tar.zst nixpkgs-9d608f5ae95bf848378debc497cdf5a7af6f96c7.zip |
Merge pull request #29210 from markus2342/fix-dmenu-wayland-build
dmenu-wayland: git-2014-11-02 -> git-2017-04-07 fix build
-rw-r--r-- | pkgs/applications/misc/dmenu/wayland.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/misc/dmenu/wayland.nix b/pkgs/applications/misc/dmenu/wayland.nix index 9a13da67745..340e8f16164 100644 --- a/pkgs/applications/misc/dmenu/wayland.nix +++ b/pkgs/applications/misc/dmenu/wayland.nix @@ -6,12 +6,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "dmenu-wayland-${version}"; - version = "git-2014-11-02"; - rev = "6e08b77428cc3c406ed2e90d4cae6c41df76341e"; + version = "git-2017-04-07"; + rev = "f385d9d18813071b4b4257bf8d4d572daeda0e70"; src = fetchurl { url = "https://github.com/michaelforney/dmenu/archive/${rev}.tar.gz"; - sha256 = "d0f73e442baf44a93a3b9d41a72e9cfa14f54af6049c90549f516722e3f88019"; + sha256 = "0y1jvh2815c005ns0bsjxsmz82smw22n6jsfg2g03a1pacakp6ys"; }; buildInputs = [ swc wld wayland libxkbcommon pixman fontconfig ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; preConfigure = [ - ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g; s@/usr/share/swc@$(echo "$nativeBuildInputs" | grep -o '[^ ]*-swc-[^ ]*')/share/swc@g" config.mk'' + ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g; s@/usr/share/swc@${swc}/share/swc@g" config.mk'' ]; meta = { |