From 6892838da010b18c00669095d193ebff75e5ff10 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 19 Jan 2018 00:36:35 -0500 Subject: [PATCH] deadpixi-sam: 2016-10-08 -> 2017-10-27 --- .../editors/deadpixi-sam/default.nix | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/deadpixi-sam/default.nix b/pkgs/applications/editors/deadpixi-sam/default.nix index 56aa90dd205a..4ab11064eae3 100644 --- a/pkgs/applications/editors/deadpixi-sam/default.nix +++ b/pkgs/applications/editors/deadpixi-sam/default.nix @@ -1,17 +1,15 @@ -{ stdenv, fetchFromGitHub, freetype, libX11, libXt, libXft -, version ? "2016-10-08" -, rev ? "a17c4a9c2a1af2de0a756fe16d482e0db88c0541" -, sha256 ? "03xmfzlijz4gbmr7l0pb1gl9kmlz1ab3hr8d51innvlasy4g6xgj" -}: +{ stdenv, fetchFromGitHub, freetype, libX11, libXi, libXt, libXft }: stdenv.mkDerivation rec { - inherit version; + version = "2017-10-27"; name = "deadpixi-sam-unstable-${version}"; - src = fetchFromGitHub { - inherit sha256 rev; - owner = "deadpixi"; - repo = "sam"; - }; + + src = fetchFromGitHub { + owner = "deadpixi"; + repo = "sam"; + rev = "51693780fb1457913389db6634163998f9b775b8"; + sha256 = "0nfkj93j4bgli4ixbk041nwi14rabk04kqg8krq4mj0044m1qywr"; + }; postPatch = '' substituteInPlace config.mk.def \ @@ -21,7 +19,7 @@ stdenv.mkDerivation rec { CFLAGS = "-D_DARWIN_C_SOURCE"; makeFlags = [ "DESTDIR=$(out)" ]; - buildInputs = [ libX11 libXt libXft ]; + buildInputs = [ libX11 libXi libXt libXft ]; postInstall = '' mkdir -p $out/share/applications