dmensamenu: 1.1.1 -> 1.2.1

This commit is contained in:
Robert Schütz 2019-01-27 14:23:02 +01:00
parent f5e4c981fc
commit f1e8aab72b
2 changed files with 31 additions and 9 deletions

View File

@ -1,21 +1,30 @@
{ stdenv, buildPythonApplication, fetchFromGitHub, requests, dmenu }:
{ stdenv, buildPythonApplication, fetchFromGitHub, substituteAll, requests, dmenu }:
buildPythonApplication rec {
name = "dmensamenu-${version}";
version = "1.1.1";
propagatedBuildInputs = [
requests
dmenu
];
pname = "dmensamenu";
version = "1.2.1";
src = fetchFromGitHub {
owner = "dotlambda";
repo = "dmensamenu";
rev = version;
sha256 = "0gc23k2zbv9zfc0v27y4spiva8cizxavpzd5pch5qbawh2lak6a3";
sha256 = "15c8g2vdban3dw3g979icypgpx52irpvv39indgk19adicgnzzqp";
};
patches = [
(substituteAll {
src = ./dmenu-path.patch;
inherit dmenu;
})
];
propagatedBuildInputs = [
requests
];
# No tests implemented
doCheck = false;
meta = with stdenv.lib; {
homepage = https://github.com/dotlambda/dmensamenu;
description = "Print German canteen menus using dmenu and OpenMensa";

View File

@ -0,0 +1,13 @@
diff --git a/dmensamenu/dmensamenu.py b/dmensamenu/dmensamenu.py
index 7df49f2..052ef1b 100644
--- a/dmensamenu/dmensamenu.py
+++ b/dmensamenu/dmensamenu.py
@@ -99,7 +99,7 @@ def main():
parser.add_argument('--city',
help='When searching for a canteen, only show the ones from the city specified'
+' (case-insensitive).')
- parser.add_argument('--dmenu', metavar='CMD', default='dmenu -i -l "$lines" -p "$date"',
+ parser.add_argument('--dmenu', metavar='CMD', default='@dmenu@/bin/dmenu -i -l "$lines" -p "$date"',
help='Command to execute. '
'Can be used to pass custom parameters to dmenu. '
'The shell variable $lines will be set to the number of items on the menu '