public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #114857 from siraben/edit-darwin

This commit is contained in:
Sandro 2021-03-18 16:22:42 +01:00 committed by GitHub
parent b77372d43d dda5a4ebfd
commit d17c31ac6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/applications/editors/edit/default.nix
View File

@ -2,39 +2,30 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "edit-nightly"; pname = "edit-nightly";
version = "20160425"; version = "20180228";
src = fetchgit { src = fetchgit {
url = "git://c9x.me/ed.git"; url = "git://c9x.me/ed.git";
rev = "323d49b68c5e804ed3b8cada0e2274f1589b3484"; rev = "77d96145b163d79186c722a7ffccfff57601157c";
sha256 = "0wv8i3ii7cd9bqhjpahwp2g5fcmyk365nc7ncmvl79cxbz3f7y8v"; sha256 = "0rsmp7ydmrq3xx5q19566is9a2v2w5yfsphivfc7j4ljp32jlyyy";
}; };
buildInputs = [ nativeBuildInputs = [ unzip pkg-config cwebbin ];
unzip buildInputs = [ ncurses libX11 libXft ];
pkg-config
ncurses
libX11
libXft
cwebbin
];
buildPhase = '' preBuild = ''
ctangle *.w ctangle *.w
make
''; '';
installPhase = '' installPhase = ''
mkdir -p $out/bin/ install -Dm755 obj/edit -t $out/bin
cp obj/edit $out/bin/edit
''; '';
meta = with lib; { meta = with lib; {
description = "A relaxing mix of Vi and ACME"; description = "A relaxing mix of Vi and ACME";
homepage = "http://c9x.me/edit"; homepage = "https://c9x.me/edit";
license = licenses.publicDomain; license = licenses.publicDomain;
maintainers = [ maintainers.vrthra ]; maintainers = [ maintainers.vrthra ];
platforms = platforms.linux; platforms = platforms.all;
}; };
} }

12
pkgs/development/tools/misc/cwebbin/default.nix
View File

@ -16,7 +16,15 @@ stdenv.mkDerivation rec {
sha256 = "1hdzxfzaibnjxjzgp6d2zay8nsarnfy9hfq55hz1bxzzl23n35aj"; sha256 = "1hdzxfzaibnjxjzgp6d2zay8nsarnfy9hfq55hz1bxzzl23n35aj";
}; };
buildInputs = [ tie ]; # Remove references to __DATE__ and __TIME__
postPatch = ''
substituteInPlace wmerg-patch.ch --replace ' ("__DATE__", "__TIME__")' ""
substituteInPlace ctang-patch.ch --replace ' ("__DATE__", "__TIME__")' ""
substituteInPlace ctangle.cxx --replace ' ("__DATE__", "__TIME__")' ""
substituteInPlace cweav-patch.ch --replace ' ("__DATE__", "__TIME__")' ""
'';
nativeBuildInputs = [ tie ];
makeFlags = [ makeFlags = [
"MACROSDIR=$(out)/share/texmf/tex/generic/cweb" "MACROSDIR=$(out)/share/texmf/tex/generic/cweb"
@ -27,7 +35,7 @@ stdenv.mkDerivation rec {
"CP=cp" "CP=cp"
"RM=rm" "RM=rm"
"PDFTEX=echo" "PDFTEX=echo"
"CC=c++" "CC=${stdenv.cc.targetPrefix}c++"
]; ];
buildPhase = '' buildPhase = ''