diff options
author | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2019-01-27 14:23:02 +0100 |
---|---|---|
committer | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2019-01-27 14:23:24 +0100 |
commit | f1e8aab72bc3c2bf1c66ca526e7cc6d7ef89186c (patch) | |
tree | 457b1e4523d768e565693293b0a00f1f507642f5 /pkgs/applications/misc/dmensamenu | |
parent | f5e4c981fc61be684e6478e209a8b2834b2d6e61 (diff) | |
download | nixpkgs-f1e8aab72bc3c2bf1c66ca526e7cc6d7ef89186c.tar nixpkgs-f1e8aab72bc3c2bf1c66ca526e7cc6d7ef89186c.tar.gz nixpkgs-f1e8aab72bc3c2bf1c66ca526e7cc6d7ef89186c.tar.bz2 nixpkgs-f1e8aab72bc3c2bf1c66ca526e7cc6d7ef89186c.tar.lz nixpkgs-f1e8aab72bc3c2bf1c66ca526e7cc6d7ef89186c.tar.xz nixpkgs-f1e8aab72bc3c2bf1c66ca526e7cc6d7ef89186c.tar.zst nixpkgs-f1e8aab72bc3c2bf1c66ca526e7cc6d7ef89186c.zip |
dmensamenu: 1.1.1 -> 1.2.1
Diffstat (limited to 'pkgs/applications/misc/dmensamenu')
-rw-r--r-- | pkgs/applications/misc/dmensamenu/default.nix | 27 | ||||
-rw-r--r-- | pkgs/applications/misc/dmensamenu/dmenu-path.patch | 13 |
2 files changed, 31 insertions, 9 deletions
diff --git a/pkgs/applications/misc/dmensamenu/default.nix b/pkgs/applications/misc/dmensamenu/default.nix index 924b95d8b6a..1c3b4133867 100644 --- a/pkgs/applications/misc/dmensamenu/default.nix +++ b/pkgs/applications/misc/dmensamenu/default.nix @@ -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"; diff --git a/pkgs/applications/misc/dmensamenu/dmenu-path.patch b/pkgs/applications/misc/dmensamenu/dmenu-path.patch new file mode 100644 index 00000000000..1508e5142d2 --- /dev/null +++ b/pkgs/applications/misc/dmensamenu/dmenu-path.patch @@ -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 ' |