alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #34035 from veprbl/samfix

Browse source 
deadpixi-sam: fix on Darwin, bump
This commit is contained in:
Daiderd Jordan 2018-01-21 00:36:07 +01:00 committed by GitHub
parent 1fa5c8abae 6892838da0
commit e072086b71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
pkgs/applications/editors/deadpixi-sam/default.nix
View file

@ -1,25 +1,25 @@
{ stdenv, fetchFromGitHub, freetype, libX11, libXt, libXft { stdenv, fetchFromGitHub, freetype, libX11, libXi, libXt, libXft }:
, version ? "2016-10-08"
, rev ? "a17c4a9c2a1af2de0a756fe16d482e0db88c0541"
, sha256 ? "03xmfzlijz4gbmr7l0pb1gl9kmlz1ab3hr8d51innvlasy4g6xgj"
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit version; version = "2017-10-27";
name = "deadpixi-sam-unstable-${version}"; name = "deadpixi-sam-unstable-${version}";
src = fetchFromGitHub {
inherit sha256 rev; src = fetchFromGitHub {
owner = "deadpixi"; owner = "deadpixi";
repo = "sam"; repo = "sam";
}; rev = "51693780fb1457913389db6634163998f9b775b8";
sha256 = "0nfkj93j4bgli4ixbk041nwi14rabk04kqg8krq4mj0044m1qywr";
};
postPatch = '' postPatch = ''
substituteInPlace config.mk.def \ substituteInPlace config.mk.def \
--replace "/usr/include/freetype2" "${freetype.dev}/include/freetype2" --replace "/usr/include/freetype2" "${freetype.dev}/include/freetype2" \
--replace "CC=gcc" ""
''; '';
CFLAGS = "-D_DARWIN_C_SOURCE";
makeFlags = [ "DESTDIR=$(out)" ]; makeFlags = [ "DESTDIR=$(out)" ];
buildInputs = [ libX11 libXt libXft ]; buildInputs = [ libX11 libXi libXt libXft ];
postInstall = '' postInstall = ''
mkdir -p $out/share/applications mkdir -p $out/share/applications
@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
description = "Updated version of the sam text editor"; description = "Updated version of the sam text editor";
license = with licenses; lpl-102; license = with licenses; lpl-102;
maintainers = with maintainers; [ ramkromberg ]; maintainers = with maintainers; [ ramkromberg ];
platforms = with platforms; linux; platforms = with platforms; unix;
}; };
} }