From 02aa3264f5f8301648ff5b0dc229b30f5c4221f3 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 8 Jun 2017 01:44:31 +0200 Subject: [PATCH] slop: 4.1.16 -> 6.3.41 --- pkgs/tools/misc/slop/default.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix index 800fad3b564e..b668b7af0d46 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -1,24 +1,28 @@ -{ stdenv, fetchurl, cmake, gengetopt, libX11, libXext, cppcheck}: +{ stdenv, fetchFromGitHub, cmake +, glm, mesa, gengetopt, libX11, libXext, libXrender, cppcheck}: stdenv.mkDerivation rec { name = "slop-${version}"; - version = "4.1.16"; + version = "6.3.41"; - src = fetchurl { - url = "https://github.com/naelstrof/slop/archive/v${version}.tar.gz"; - sha256 = "0679ax0jr97x91hmp9qrspdka8cvl3xa77z92k4qgicbnb6hr7y2"; + src = fetchFromGitHub { + owner = "naelstrof"; + repo = "slop"; + rev = "v${version}"; + sha256 = "051w2hcpz4qmvy7bmnzv7llxr2jbcpfxdadlzr2cidr323cann27"; }; - buildInputs = [ cmake gengetopt libX11 libXext ] + nativeBuildInputs = [ cmake ]; + buildInputs = [ glm mesa gengetopt libX11 libXext libXrender ] ++ stdenv.lib.optional doCheck cppcheck; doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/naelstrof/slop; + inherit (src.meta) homepage; description = "Queries a selection from the user and prints to stdout"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.gpl3Plus; - maintainers = with maintainers; [ mbakke ]; + maintainers = with maintainers; [ primeos mbakke ]; }; }