nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 07:53:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set upstream to https://github.com/ibara/mg

Browse Source 
As per reasonable suggestion, instead of extensively patching the
hboetes version of mg to work on MacOS using bits from ibara's mg,
just set upstream to ibara's mg.

This also removes the dependency on libbsd, although I'm not sure
if this is a good or bad thing.
This commit is contained in:
D. Guthrie 2020-05-07 17:37:53 +01:00
parent fcedd9f78e
commit c54d37598a
2 changed files with 7 additions and 1435 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1426
pkgs/applications/editors/mg/darwin_no_libbsd.patch
View File

File diff suppressed because it is too large Load Diff

16
pkgs/applications/editors/mg/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, pkgconfig, ncurses, buildPackages, libbsd }: { stdenv, fetchFromGitHub, pkgconfig, ncurses, buildPackages }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mg"; pname = "mg";
version = "20200215"; version = "6.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hboetes"; owner = "ibara";
repo = "mg"; repo = "mg";
rev = "20200215"; rev = "mg-6.7";
sha256 = "1rss7d43hbq43n63gxfvx4b2vh2km58cchwzdf2ssqhaz3qj40m6"; sha256 = "15adwibq6xrfxbrxzk765g9250iyfn4wbcxd7kcsabiwn6apm0ai";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
@ -21,13 +21,11 @@ stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
patches = ./darwin_no_libbsd.patch; buildInputs = [ ncurses ];
buildInputs = [ ncurses ] ++ stdenv.lib.optional (!stdenv.isDarwin) libbsd;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team"; description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team";
homepage = "https://homepage.boetes.org/software/mg"; homepage = "https://man.openbsd.org/OpenBSD-current/man1/mg.1";
license = licenses.publicDomain; license = licenses.publicDomain;
platforms = platforms.all; platforms = platforms.all;
}; };