Merge pull request #228953 from blin/master

rosie: unstable-2020-01-11 -> 1.3.0

authored by Weijia Wang and committed by GitHub 704e55fc be87064b

+19 -5
+19 -5
pkgs/tools/text/rosie/default.nix
··· 7 7 8 8 stdenv.mkDerivation rec { 9 9 pname = "rosie"; 10 - version = "unstable-2020-01-11"; 10 + version = "1.3.0"; 11 11 12 12 src = fetchgit { 13 13 url = "https://gitlab.com/rosie-pattern-language/rosie"; 14 - rev = "670e9027563609ba2ea31e14e2621a1302742795"; 15 - sha256 = "0jc512dbn62a1fniknhbp6q0xa1p7xi3hn5v60is8sy9jgi3afxv"; 14 + rev = "9303e04ae2cffabdda6ccc4e2a351a47218615ff"; 15 + sha256 = "1smh760baf43hr56p6rh4khz3shyzda5lqva4ffxwchl7yy7r82j"; 16 16 fetchSubmodules = true; 17 17 }; 18 18 ··· 23 23 24 24 preConfigure = '' 25 25 patchShebangs src/build_info.sh 26 + # rosie is ran as part of `make check`, 27 + # and so needs to be patched in preConfigure. 28 + patchShebangs rosie 26 29 # Part of the same Makefile target which calls git to update submodules 27 30 ln -s src submodules/lua/include 31 + # ldconfig is irrelevant, disable it inside `make installforce`. 32 + sed -iE 's/ldconfig/echo skippin ldconfig/' Makefile 33 + sed -iE '/ld.so.conf.d/d' Makefile 34 + ''; 35 + 36 + preInstall = lib.optionalString stdenv.isDarwin '' 37 + install_name_tool -add_rpath $out/lib build/bin/rosie 38 + install_name_tool -id $out/lib/librosie.dylib build/lib/librosie.dylib 28 39 ''; 29 40 30 41 postInstall = '' 31 42 mkdir -p $out/share/emacs/site-lisp $out/share/vim-plugins $out/share/nvim 32 - mv $out/lib/rosie/extra/extra/emacs/* $out/share/emacs/site-lisp/ 33 - mv $out/lib/rosie/extra/extra/vim $out/share/vim-plugins/rosie 43 + mv $out/lib/rosie/extra/emacs/* $out/share/emacs/site-lisp/ 44 + mv $out/lib/rosie/extra/vim $out/share/vim-plugins/rosie 34 45 ln -s $out/share/vim-plugins/rosie $out/share/nvim/site 35 46 ''; 47 + 48 + # librosie.so is dlopen'ed , so we disable ELF patching to preserve RUNPATH . 49 + dontPatchELF = true; 36 50 37 51 makeFlags = [ "DESTDIR=${placeholder "out"}" ]; 38 52