Commit eb7298e5 authored by Jan Tojnar's avatar Jan Tojnar
Browse files

sublime4,sublime-merge: Use --replace-fail 

Also split the substitute call for legibility.
parent 86c02994

pkgs/applications/editors/sublime/4/common.nix

+6 −1
Original line number Diff line number Diff line
@@ -158,7 +158,12 @@ stdenv.mkDerivation (rec { 
    )

    + ''

      mkdir -p "$out/share/applications"

      substitute "''$${primaryBinary}/${primaryBinary}.desktop" "$out/share/applications/${primaryBinary}.desktop" --replace "/opt/${primaryBinary}/${primaryBinary}" "${primaryBinary}"



      substitute \

        "''$${primaryBinary}/${primaryBinary}.desktop" \

        "$out/share/applications/${primaryBinary}.desktop" \

        --replace-fail "/opt/${primaryBinary}/${primaryBinary}" "${primaryBinary}"



      for directory in ''$${primaryBinary}/Icon/*; do

        size=$(basename $directory)

        mkdir -p "$out/share/icons/hicolor/$size/apps"

pkgs/applications/version-management/sublime-merge/common.nix

+6 −1
Original line number Diff line number Diff line
@@ -161,7 +161,12 @@ stdenv.mkDerivation (rec { 
    )

    + ''

      mkdir -p "$out/share/applications"

      substitute "''$${primaryBinary}/${primaryBinary}.desktop" "$out/share/applications/${primaryBinary}.desktop" --replace "/opt/${primaryBinary}/${primaryBinary}" "${primaryBinary}"



      substitute \

        "''$${primaryBinary}/${primaryBinary}.desktop" \

        "$out/share/applications/${primaryBinary}.desktop" \

        --replace-fail "/opt/${primaryBinary}/${primaryBinary}" "${primaryBinary}"



      for directory in ''$${primaryBinary}/Icon/*; do

        size=$(basename $directory)

        mkdir -p "$out/share/icons/hicolor/$size/apps"