From 301ab39213d25d42a355421c9c441aac3a87e836 Mon Sep 17 00:00:00 2001
From: Markus Mueller <john.subscriber@markus.institute>
Date: Sun, 10 Sep 2017 15:21:35 +0000
Subject: [PATCH] dmenu-wayland: git-2014-11-02 -> git-2017-04-07 fix build
Bumped and fixed substitution for package to build successfully.
---
pkgs/applications/misc/dmenu/wayland.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/applications/misc/dmenu/wayland.nix b/pkgs/applications/misc/dmenu/wayland.nix
index 9a13da677456..340e8f161647 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 = {