diff options
| author | Chris Martin <ch.martin@gmail.com> | 2017-08-15 14:34:10 -0400 |
|---|---|---|
| committer | Chris Martin <ch.martin@gmail.com> | 2017-08-15 14:37:15 -0400 |
| commit | 2b0f79e5c24b2a3f34d93704cbab738813f0f53c (patch) | |
| tree | ad3bc325a4d1261fd9d26cc194d724fd0791f72b /pkgs/applications/editors | |
| parent | 11eece3a2e51e33afccb365b774aa21f600db988 (diff) | |
| download | nixlib-2b0f79e5c24b2a3f34d93704cbab738813f0f53c.tar nixlib-2b0f79e5c24b2a3f34d93704cbab738813f0f53c.tar.gz nixlib-2b0f79e5c24b2a3f34d93704cbab738813f0f53c.tar.bz2 nixlib-2b0f79e5c24b2a3f34d93704cbab738813f0f53c.tar.lz nixlib-2b0f79e5c24b2a3f34d93704cbab738813f0f53c.tar.xz nixlib-2b0f79e5c24b2a3f34d93704cbab738813f0f53c.tar.zst nixlib-2b0f79e5c24b2a3f34d93704cbab738813f0f53c.zip | |
sublime3: fix package re-zipping
The previous zip command wasn't including directories. This Sublime package only has one directory in it, so the resulting bug was subtle. The directory contained the send2trash Python package, so the result was that file deletion didn't work.
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/sublime3/default.nix | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index 0b8ecda62302..c295313621e3 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -31,20 +31,19 @@ in let dontStrip = true; dontPatchELF = true; - buildInputs = [ makeWrapper ]; + buildInputs = [ makeWrapper zip unzip ]; # make exec.py in Default.sublime-package use own bash with # an LD_PRELOAD instead of "/bin/bash" patchPhase = '' mkdir Default.sublime-package-fix ( cd Default.sublime-package-fix - ${unzip}/bin/unzip ../Packages/Default.sublime-package > /dev/null + unzip -q ../Packages/Default.sublime-package substituteInPlace "exec.py" --replace \ "[\"/bin/bash\"" \ "[\"$out/sublime_bash\"" + zip -q ../Packages/Default.sublime-package **/* ) - ${zip}/bin/zip -j Default.sublime-package.zip Default.sublime-package-fix/* > /dev/null - mv Default.sublime-package.zip Packages/Default.sublime-package rm -r Default.sublime-package-fix ''; @@ -85,14 +84,17 @@ in stdenv.mkDerivation { name = "sublimetext3-${build}"; phases = [ "installPhase" ]; + + inherit sublime; + installPhase = '' mkdir -p $out/bin - ln -s ${sublime}/sublime_text $out/bin/subl - ln -s ${sublime}/sublime_text $out/bin/sublime - ln -s ${sublime}/sublime_text $out/bin/sublime3 + ln -s $sublime/sublime_text $out/bin/subl + ln -s $sublime/sublime_text $out/bin/sublime + ln -s $sublime/sublime_text $out/bin/sublime3 mkdir -p $out/share/applications - ln -s ${sublime}/sublime_text.desktop $out/share/applications/sublime_text.desktop - ln -s ${sublime}/Icon/256x256/ $out/share/icons + ln -s $sublime/sublime_text.desktop $out/share/applications/sublime_text.desktop + ln -s $sublime/Icon/256x256/ $out/share/icons ''; meta = with stdenv.lib; { |