git.iko.soy/typeable/nixpkgs
on master help sign in
sublime-{merge,text}: make common.nix files have a similar structure

In the future it's desired to unify Sublime packages expressions. So them having a shared structure will make this more achievable.

commit148119b9a6636a4fdfbdc1cc0dcbf268d523008d authorTim Zook <tim@zookatron.com> dateWed 10 Apr 2019, 12:19 (8 years ago) parentb59b31e
2 files changed+102−80
pkgs/applications/editors/sublime/3/common.nix+57−53 pkgs/applications/version-management/sublime-merge/common.nix+45−27
pkgs/applications/editors/sublime/3/common.nix+57−53
@@ -1,47 +1,55 @@
1−{buildVersion, x32sha256, x64sha256, dev ? false}:
1+{ buildVersion, x32sha256, x64sha256, dev ? false }:
22
3−{ fetchurl, stdenv, glib, glibcLocales, xorg, cairo, gtk2, gtk3, pango, makeWrapper, wrapGAppsHook, openssl, bzip2, runtimeShell,
4− pkexecPath ? "/run/wrappers/bin/pkexec", libredirect,
5− gksuSupport ? false, gksu, unzip, zip, bash,
6− writeScript, common-updater-scripts, curl, gnugrep}:
3+{ fetchurl, stdenv, xorg, glib, glibcLocales, gtk2, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook
4+, pkexecPath ? "/run/wrappers/bin/pkexec", gksuSupport ? false, gksu
5+, writeScript, common-updater-scripts, curl, gnugrep
6+, openssl, bzip2, bash, unzip, zip
7+}:
78
89assert gksuSupport -> gksu != null;
910
1011let
11− legacy = stdenv.lib.versionOlder buildVersion "3181";
12− libPath = stdenv.lib.makeLibraryPath [ glib xorg.libX11 (if legacy then gtk2 else gtk3) cairo pango ];
13− redirects = [ "/usr/bin/pkexec=${pkexecPath}" ]
14− ++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo";
15−in let
12+ pname = "sublimetext3";
13+ packageAttribute = "sublime3${stdenv.lib.optionalString dev "-dev"}";
14+ binaries = [ "sublime_text" "plugin_host" "crash_reporter" ];
15+ primaryBinary = "sublime_text";
16+ primaryBinaryAliases = [ "subl" "sublime" "sublime3" ];
17+ downloadUrl = "https://download.sublimetext.com/sublime_text_3_build_${buildVersion}_${arch}.tar.bz2";
18+ downloadArchiveType = "tar.bz2";
19+ versionUrl = "https://www.sublimetext.com/${if dev then "3dev" else "3"}";
20+ versionFile = "pkgs/applications/editors/sublime/3/packages.nix";
21+ usesGtk2 = stdenv.lib.versionOlder buildVersion "3181";
1622 archSha256 =
1723 if stdenv.hostPlatform.system == "i686-linux" then
1824 x32sha256
1925 else
2026 x64sha256;
21−
2227 arch =
2328 if stdenv.hostPlatform.system == "i686-linux" then
2429 "x32"
2530 else
2631 "x64";
2732
28− # package with just the binaries
29− sublime = stdenv.mkDerivation {
30− name = "sublimetext3-bin-${buildVersion}";
31− src =
32− fetchurl {
33− name = "sublimetext-${buildVersion}.tar.bz2";
34− url = "https://download.sublimetext.com/sublime_text_3_build_${buildVersion}_${arch}.tar.bz2";
35− sha256 = archSha256;
36− };
33+ libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib (if usesGtk2 then gtk2 else gtk3) cairo pango ];
34+ redirects = [ "/usr/bin/pkexec=${pkexecPath}" ]
35+ ++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo";
36+in let
37+ binaryPackage = stdenv.mkDerivation {
38+ pname = "${pname}-bin";
39+ version = buildVersion;
40+
41+ src = fetchurl {
42+ name = "${pname}-bin-${buildVersion}.${downloadArchiveType}";
43+ url = downloadUrl;
44+ sha256 = archSha256;
45+ };
3746
3847 dontStrip = true;
3948 dontPatchELF = true;
40− buildInputs = stdenv.lib.optionals (!legacy) [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH
41− nativeBuildInputs = [ makeWrapper zip unzip ] ++ stdenv.lib.optional (!legacy) wrapGAppsHook;
49+ buildInputs = stdenv.lib.optionals (!usesGtk2) [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH
50+ nativeBuildInputs = [ zip unzip makeWrapper ] ++ stdenv.lib.optional (!usesGtk2) wrapGAppsHook;
4251
43− # make exec.py in Default.sublime-package use own bash with
44− # an LD_PRELOAD instead of "/bin/bash"
52+ # make exec.py in Default.sublime-package use own bash with an LD_PRELOAD instead of "/bin/bash"
4553 patchPhase = ''
4654 runHook prePatch
4755
@@ -61,15 +69,15 @@ in let
6169 buildPhase = ''
6270 runHook preBuild
6371
64− for i in sublime_text plugin_host crash_reporter; do
72+ for binary in ${ builtins.concatStringsSep " " binaries }; do
6573 patchelf \
6674 --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
6775 --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \
68− $i
76+ $binary
6977 done
7078
7179 # Rewrite pkexec|gksudo argument. Note that we can't delete bytes in binary.
72− sed -i -e 's,/bin/cp\x00,cp\x00\x00\x00\x00\x00\x00,g' sublime_text
80+ sed -i -e 's,/bin/cp\x00,cp\x00\x00\x00\x00\x00\x00,g' ${primaryBinary}
7381
7482 runHook postBuild
7583 '';
@@ -77,11 +85,8 @@ in let
7785 installPhase = ''
7886 runHook preInstall
7987
80− # Correct sublime_text.desktop to exec `sublime' instead of /opt/sublime_text
81− sed -e "s,/opt/sublime_text/sublime_text,$out/sublime_text," -i sublime_text.desktop
82−
8388 mkdir -p $out
84− cp -prvd * $out/
89+ cp -r * $out/
8590
8691 # We can't just call /usr/bin/env bash because a relocation error occurs
8792 # when trying to run a build from within Sublime Text
@@ -96,52 +101,51 @@ in let
96101 wrapProgram $out/sublime_bash \
97102 --set LD_PRELOAD "${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1"
98103
99− wrapProgram $out/sublime_text \
104+ wrapProgram $out/${primaryBinary} \
100105 --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
101106 --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects} \
102107 --set LOCALE_ARCHIVE "${glibcLocales.out}/lib/locale/locale-archive" \
103− ${stdenv.lib.optionalString (!legacy) ''"''${gappsWrapperArgs[@]}"''}
108+ ${stdenv.lib.optionalString (!usesGtk2) ''"''${gappsWrapperArgs[@]}"''}
104109
105110 # Without this, plugin_host crashes, even though it has the rpath
106111 wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl.out}/lib/libssl.so:${bzip2.out}/lib/libbz2.so
107112 '';
108113 };
109114in stdenv.mkDerivation (rec {
110− name = "sublimetext3-${buildVersion}";
115+ inherit pname;
116+ version = buildVersion;
111117
112118 phases = [ "installPhase" ];
113119
114− inherit sublime;
120+ ${primaryBinary} = binaryPackage;
121+
122+ nativeBuildInputs = [ makeWrapper ];
115123
116124 installPhase = ''
117− mkdir -p $out/bin
118−
119− cat > $out/bin/subl <<-EOF
120− #!${runtimeShell}
121− exec $sublime/sublime_text "\$@"
122− EOF
123− chmod +x $out/bin/subl
124−
125− ln $out/bin/subl $out/bin/sublime
126− ln $out/bin/subl $out/bin/sublime3
127− mkdir -p $out/share/applications
128− ln -s $sublime/sublime_text.desktop $out/share/applications/sublime_text.desktop
129− ln -s $sublime/Icon/256x256/ $out/share/icons
125+ mkdir -p "$out/bin"
126+ makeWrapper "''$${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}"
127+ '' + builtins.concatStringsSep "" (map (binaryAlias: "ln -s $out/bin/${primaryBinary} $out/bin/${binaryAlias}\n") primaryBinaryAliases) + ''
128+ mkdir -p "$out/share/applications"
129+ substitute "''$${primaryBinary}/${primaryBinary}.desktop" "$out/share/applications/${primaryBinary}.desktop" --replace "/opt/${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}"
130+ for directory in ''$${primaryBinary}/Icon/*; do
131+ size=$(basename $directory)
132+ mkdir -p "$out/share/icons/hicolor/$size/apps"
133+ ln -s ''$${primaryBinary}/Icon/$size/* $out/share/icons/hicolor/$size/apps
134+ done
130135 '';
131136
132− passthru.updateScript = writeScript "sublime3-update-script" ''
137+ passthru.updateScript = writeScript "${pname}-update-script" ''
133138 #!${stdenv.shell}
134139 set -o errexit
135140 PATH=${stdenv.lib.makeBinPath [ common-updater-scripts curl gnugrep ]}
136141
137− latestVersion=$(curl https://www.sublimetext.com/3${stdenv.lib.optionalString dev "dev"} | grep -Po '(?<=<p class="latest"><i>Version:</i> Build )([0-9]+)')
142+ latestVersion=$(curl -s ${versionUrl} | grep -Po '(?<=<p class="latest"><i>Version:</i> Build )([0-9]+)')
138143
139144 for platform in ${stdenv.lib.concatStringsSep " " meta.platforms}; do
140− package=sublime3${stdenv.lib.optionalString dev "-dev"}
141145 # The script will not perform an update when the version attribute is up to date from previous platform run
142146 # We need to clear it before each run
143− update-source-version ''${package}.sublime 0 0000000000000000000000000000000000000000000000000000000000000000 --file=pkgs/applications/editors/sublime/3/packages.nix --version-key=buildVersion --system=$platform
144− update-source-version ''${package}.sublime $latestVersion --file=pkgs/applications/editors/sublime/3/packages.nix --version-key=buildVersion --system=$platform
147+ update-source-version ${packageAttribute}.${primaryBinary} 0 0000000000000000000000000000000000000000000000000000000000000000 --file=${versionFile} --version-key=buildVersion --system=$platform
148+ update-source-version ${packageAttribute}.${primaryBinary} $latestVersion --file=${versionFile} --version-key=buildVersion --system=$platform
145149 done
146150 '';
147151
pkgs/applications/version-management/sublime-merge/common.nix+45−27
@@ -1,6 +1,6 @@
11{ buildVersion, sha256, dev ? false }:
22
3−{ fetchurl, stdenv, xorg, glib, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook
3+{ fetchurl, stdenv, xorg, glib, glibcLocales, gtk2, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook
44, pkexecPath ? "/run/wrappers/bin/pkexec", gksuSupport ? false, gksu
55, writeScript, common-updater-scripts, curl, gnugrep
66}:
@@ -8,38 +8,50 @@
88assert gksuSupport -> gksu != null;
99
1010let
11− libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango ];
11+ pname = "sublime-merge";
12+ packageAttribute = "sublime-merge${stdenv.lib.optionalString dev "-dev"}";
13+ binaries = [ "sublime_merge" "crash_reporter" "git-credential-sublime" "ssh-askpass-sublime" ];
14+ primaryBinary = "sublime_merge";
15+ primaryBinaryAliases = [ "smerge" ];
16+ downloadUrl = "https://download.sublimetext.com/sublime_merge_build_${buildVersion}_${arch}.tar.xz";
17+ downloadArchiveType = "tar.xz";
18+ versionUrl = "https://www.sublimemerge.com/${if dev then "dev" else "download"}";
19+ versionFile = "pkgs/applications/version-management/sublime-merge/default.nix";
20+ usesGtk2 = false;
21+ archSha256 = sha256;
22+ arch = "x64";
23+
24+ libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib (if usesGtk2 then gtk2 else gtk3) cairo pango ];
1225 redirects = [ "/usr/bin/pkexec=${pkexecPath}" ]
1326 ++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo";
1427in let
15− # package with just the binaries
16− sublime_merge = stdenv.mkDerivation {
17− pname = "sublime-merge-bin";
28+ binaryPackage = stdenv.mkDerivation {
29+ pname = "${pname}-bin";
1830 version = buildVersion;
1931
2032 src = fetchurl {
21− name = "sublime-merge-${buildVersion}.tar.xz";
22− url = "https://download.sublimetext.com/sublime_merge_build_${buildVersion}_x64.tar.xz";
23− inherit sha256;
33+ name = "${pname}-bin-${buildVersion}.${downloadArchiveType}";
34+ url = downloadUrl;
35+ sha256 = archSha256;
2436 };
2537
2638 dontStrip = true;
2739 dontPatchELF = true;
28− buildInputs = [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH
29− nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
40+ buildInputs = stdenv.lib.optionals (!usesGtk2) [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH
41+ nativeBuildInputs = [ makeWrapper ] ++ stdenv.lib.optional (!usesGtk2) wrapGAppsHook;
3042
3143 buildPhase = ''
3244 runHook preBuild
3345
34− for binary in sublime_merge crash_reporter git-credential-sublime ssh-askpass-sublime; do
46+ for binary in ${ builtins.concatStringsSep " " binaries }; do
3547 patchelf \
3648 --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
37− --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib64 \
49+ --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \
3850 $binary
3951 done
4052
4153 # Rewrite pkexec|gksudo argument. Note that we can't delete bytes in binary.
42− sed -i -e 's,/bin/cp\x00,cp\x00\x00\x00\x00\x00\x00,g' sublime_merge
54+ sed -i -e 's,/bin/cp\x00,cp\x00\x00\x00\x00\x00\x00,g' ${primaryBinary}
4355
4456 runHook postBuild
4557 '';
@@ -56,43 +68,49 @@ in let
5668 dontWrapGApps = true; # non-standard location, need to wrap the executables manually
5769
5870 postFixup = ''
59− wrapProgram $out/sublime_merge \
71+ wrapProgram $out/${primaryBinary} \
6072 --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
6173 --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects} \
62− "''${gappsWrapperArgs[@]}"
74+ --set LOCALE_ARCHIVE "${glibcLocales.out}/lib/locale/locale-archive" \
75+ ${stdenv.lib.optionalString (!usesGtk2) ''"''${gappsWrapperArgs[@]}"''}
6376 '';
6477 };
65−in stdenv.mkDerivation {
66− pname = "sublime-merge";
78+in stdenv.mkDerivation (rec {
79+ inherit pname;
6780 version = buildVersion;
6881
6982 phases = [ "installPhase" ];
7083
71− inherit sublime_merge;
84+ ${primaryBinary} = binaryPackage;
7285
7386 nativeBuildInputs = [ makeWrapper ];
7487
7588 installPhase = ''
7689 mkdir -p "$out/bin"
77− makeWrapper "$sublime_merge/sublime_merge" "$out/bin/sublime_merge"
78− ln -s "$out/bin/sublime_merge" "$out/bin/smerge"
90+ makeWrapper "''$${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}"
91+ '' + builtins.concatStringsSep "" (map (binaryAlias: "ln -s $out/bin/${primaryBinary} $out/bin/${binaryAlias}\n") primaryBinaryAliases) + ''
7992 mkdir -p "$out/share/applications"
80− substitute "$sublime_merge/sublime_merge.desktop" "$out/share/applications/sublime_merge.desktop" --replace "/opt/sublime_merge/sublime_merge" "$out/bin/sublime_merge"
81− for directory in $sublime_merge/Icon/*; do
93+ substitute "''$${primaryBinary}/${primaryBinary}.desktop" "$out/share/applications/${primaryBinary}.desktop" --replace "/opt/${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}"
94+ for directory in ''$${primaryBinary}/Icon/*; do
8295 size=$(basename $directory)
8396 mkdir -p "$out/share/icons/hicolor/$size/apps"
84− ln -s "$sublime_merge/Icon/$size/sublime-merge.png" "$out/share/icons/hicolor/$size/apps"
97+ ln -s ''$${primaryBinary}/Icon/$size/* $out/share/icons/hicolor/$size/apps
8598 done
8699 '';
87100
88− passthru.updateScript = writeScript "sublime-merge-update-script" ''
101+ passthru.updateScript = writeScript "${pname}-update-script" ''
89102 #!${stdenv.shell}
90103 set -o errexit
91104 PATH=${stdenv.lib.makeBinPath [ common-updater-scripts curl gnugrep ]}
92105
93− latestVersion=$(curl -s https://www.sublimemerge.com/${if dev then "dev" else "download"} | grep -Po '(?<=<p class="latest"><i>Version:</i> Build )([0-9]+)')
106+ latestVersion=$(curl -s ${versionUrl} | grep -Po '(?<=<p class="latest"><i>Version:</i> Build )([0-9]+)')
94107
95− update-source-version sublime-merge${stdenv.lib.optionalString dev "-dev"}.sublime_merge $latestVersion --file=pkgs/applications/version-management/sublime-merge/default.nix --version-key=buildVersion --system=x86_64-linux
108+ for platform in ${stdenv.lib.concatStringsSep " " meta.platforms}; do
109+ # The script will not perform an update when the version attribute is up to date from previous platform run
110+ # We need to clear it before each run
111+ update-source-version ${packageAttribute}.${primaryBinary} 0 0000000000000000000000000000000000000000000000000000000000000000 --file=${versionFile} --version-key=buildVersion --system=$platform
112+ update-source-version ${packageAttribute}.${primaryBinary} $latestVersion --file=${versionFile} --version-key=buildVersion --system=$platform
113+ done
96114 '';
97115
98116 meta = with stdenv.lib; {
@@ -102,4 +120,4 @@ in stdenv.mkDerivation {
102120 license = licenses.unfree;
103121 platforms = [ "x86_64-linux" ];
104122 };
105−}
123+})