git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #114857 from siraben/edit-darwin
commitd17c31ac6cee5ca1c21b824c184b23300b08d28f authorSandro <sandro.jaeckel@gmail.com> dateThu 18 Mar 2021, 16:22 (6 years ago) parentb77372ddda5a4e
2 files changed+19−20
pkgs/applications/editors/edit/default.nix+9−18 pkgs/development/tools/misc/cwebbin/default.nix+10−2
pkgs/applications/editors/edit/default.nix+9−18
@@ -2,39 +2,30 @@
22
33stdenv.mkDerivation {
44 pname = "edit-nightly";
5− version = "20160425";
5+ version = "20180228";
66
77 src = fetchgit {
88 url = "git://c9x.me/ed.git";
9− rev = "323d49b68c5e804ed3b8cada0e2274f1589b3484";
10− sha256 = "0wv8i3ii7cd9bqhjpahwp2g5fcmyk365nc7ncmvl79cxbz3f7y8v";
9+ rev = "77d96145b163d79186c722a7ffccfff57601157c";
10+ sha256 = "0rsmp7ydmrq3xx5q19566is9a2v2w5yfsphivfc7j4ljp32jlyyy";
1111 };
1212
13− buildInputs = [
14− unzip
15− pkg-config
16− ncurses
17− libX11
18− libXft
19− cwebbin
20− ];
13+ nativeBuildInputs = [ unzip pkg-config cwebbin ];
14+ buildInputs = [ ncurses libX11 libXft ];
2115
22− buildPhase = ''
16+ preBuild = ''
2317 ctangle *.w
24− make
2518 '';
2619
2720 installPhase = ''
28− mkdir -p $out/bin/
29− cp obj/edit $out/bin/edit
21+ install -Dm755 obj/edit -t $out/bin
3022 '';
3123
3224 meta = with lib; {
3325 description = "A relaxing mix of Vi and ACME";
34− homepage = "http://c9x.me/edit";
26+ homepage = "https://c9x.me/edit";
3527 license = licenses.publicDomain;
3628 maintainers = [ maintainers.vrthra ];
37− platforms = platforms.linux;
29+ platforms = platforms.all;
3830 };
3931}
40−
pkgs/development/tools/misc/cwebbin/default.nix+10−2
@@ -16,7 +16,15 @@ stdenv.mkDerivation rec {
1616 sha256 = "1hdzxfzaibnjxjzgp6d2zay8nsarnfy9hfq55hz1bxzzl23n35aj";
1717 };
1818
19− buildInputs = [ tie ];
19+ # Remove references to __DATE__ and __TIME__
20+ postPatch = ''
21+ substituteInPlace wmerg-patch.ch --replace ' ("__DATE__", "__TIME__")' ""
22+ substituteInPlace ctang-patch.ch --replace ' ("__DATE__", "__TIME__")' ""
23+ substituteInPlace ctangle.cxx --replace ' ("__DATE__", "__TIME__")' ""
24+ substituteInPlace cweav-patch.ch --replace ' ("__DATE__", "__TIME__")' ""
25+ '';
26+
27+ nativeBuildInputs = [ tie ];
2028
2129 makeFlags = [
2230 "MACROSDIR=$(out)/share/texmf/tex/generic/cweb"
@@ -27,7 +35,7 @@ stdenv.mkDerivation rec {
2735 "CP=cp"
2836 "RM=rm"
2937 "PDFTEX=echo"
30− "CC=c++"
38+ "CC=${stdenv.cc.targetPrefix}c++"
3139 ];
3240
3341 buildPhase = ''