public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Tim Zook 2019-04-10 12:19:28 -05:00 committed by worldofpeace
parent b59b31e36c
commit 148119b9a6
2 changed files with 102 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
pkgs/applications/editors/sublime/3/common.nix
View File

@ -1,47 +1,55 @@
{buildVersion, x32sha256, x64sha256, dev ? false}: { buildVersion, x32sha256, x64sha256, dev ? false }:
{ fetchurl, stdenv, glib, glibcLocales, xorg, cairo, gtk2, gtk3, pango, makeWrapper, wrapGAppsHook, openssl, bzip2, runtimeShell, { fetchurl, stdenv, xorg, glib, glibcLocales, gtk2, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook
pkexecPath ? "/run/wrappers/bin/pkexec", libredirect, , pkexecPath ? "/run/wrappers/bin/pkexec", gksuSupport ? false, gksu
gksuSupport ? false, gksu, unzip, zip, bash, , writeScript, common-updater-scripts, curl, gnugrep
writeScript, common-updater-scripts, curl, gnugrep}: , openssl, bzip2, bash, unzip, zip
}:
assert gksuSupport -> gksu != null; assert gksuSupport -> gksu != null;
let let
legacy = stdenv.lib.versionOlder buildVersion "3181"; pname = "sublimetext3";
libPath = stdenv.lib.makeLibraryPath [ glib xorg.libX11 (if legacy then gtk2 else gtk3) cairo pango ]; packageAttribute = "sublime3${stdenv.lib.optionalString dev "-dev"}";
redirects = [ "/usr/bin/pkexec=${pkexecPath}" ] binaries = [ "sublime_text" "plugin_host" "crash_reporter" ];
++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo"; primaryBinary = "sublime_text";
in let primaryBinaryAliases = [ "subl" "sublime" "sublime3" ];
downloadUrl = "https://download.sublimetext.com/sublime_text_3_build_${buildVersion}_${arch}.tar.bz2";
downloadArchiveType = "tar.bz2";
versionUrl = "https://www.sublimetext.com/${if dev then "3dev" else "3"}";
versionFile = "pkgs/applications/editors/sublime/3/packages.nix";
usesGtk2 = stdenv.lib.versionOlder buildVersion "3181";
archSha256 = archSha256 =
if stdenv.hostPlatform.system == "i686-linux" then if stdenv.hostPlatform.system == "i686-linux" then
x32sha256 x32sha256
else else
x64sha256; x64sha256;
arch = arch =
if stdenv.hostPlatform.system == "i686-linux" then if stdenv.hostPlatform.system == "i686-linux" then
"x32" "x32"
else else
"x64"; "x64";
# package with just the binaries libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib (if usesGtk2 then gtk2 else gtk3) cairo pango ];
sublime = stdenv.mkDerivation { redirects = [ "/usr/bin/pkexec=${pkexecPath}" ]
name = "sublimetext3-bin-${buildVersion}"; ++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo";
src = in let
fetchurl { binaryPackage = stdenv.mkDerivation {
name = "sublimetext-${buildVersion}.tar.bz2"; pname = "${pname}-bin";
url = "https://download.sublimetext.com/sublime_text_3_build_${buildVersion}_${arch}.tar.bz2"; version = buildVersion;
sha256 = archSha256;
}; src = fetchurl {
name = "${pname}-bin-${buildVersion}.${downloadArchiveType}";
url = downloadUrl;
sha256 = archSha256;
};
dontStrip = true; dontStrip = true;
dontPatchELF = true; dontPatchELF = true;
buildInputs = stdenv.lib.optionals (!legacy) [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH buildInputs = stdenv.lib.optionals (!usesGtk2) [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH
nativeBuildInputs = [ makeWrapper zip unzip ] ++ stdenv.lib.optional (!legacy) wrapGAppsHook; nativeBuildInputs = [ zip unzip makeWrapper ] ++ stdenv.lib.optional (!usesGtk2) wrapGAppsHook;
# make exec.py in Default.sublime-package use own bash with # make exec.py in Default.sublime-package use own bash with an LD_PRELOAD instead of "/bin/bash"
# an LD_PRELOAD instead of "/bin/bash"
patchPhase = '' patchPhase = ''
runHook prePatch runHook prePatch
@ -61,15 +69,15 @@ in let
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
for i in sublime_text plugin_host crash_reporter; do for binary in ${ builtins.concatStringsSep " " binaries }; do
patchelf \ patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \
$i $binary
done done
# Rewrite pkexec|gksudo argument. Note that we can't delete bytes in binary. # Rewrite pkexec|gksudo argument. Note that we can't delete bytes in binary.
sed -i -e 's,/bin/cp\x00,cp\x00\x00\x00\x00\x00\x00,g' sublime_text sed -i -e 's,/bin/cp\x00,cp\x00\x00\x00\x00\x00\x00,g' ${primaryBinary}
runHook postBuild runHook postBuild
''; '';
@ -77,11 +85,8 @@ in let
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
# Correct sublime_text.desktop to exec `sublime' instead of /opt/sublime_text
sed -e "s,/opt/sublime_text/sublime_text,$out/sublime_text," -i sublime_text.desktop
mkdir -p $out mkdir -p $out
cp -prvd * $out/ cp -r * $out/
# We can't just call /usr/bin/env bash because a relocation error occurs # We can't just call /usr/bin/env bash because a relocation error occurs
# when trying to run a build from within Sublime Text # when trying to run a build from within Sublime Text
@ -96,52 +101,51 @@ in let
wrapProgram $out/sublime_bash \ wrapProgram $out/sublime_bash \
--set LD_PRELOAD "${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1" --set LD_PRELOAD "${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1"
wrapProgram $out/sublime_text \ wrapProgram $out/${primaryBinary} \
--set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
--set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects} \ --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects} \
--set LOCALE_ARCHIVE "${glibcLocales.out}/lib/locale/locale-archive" \ --set LOCALE_ARCHIVE "${glibcLocales.out}/lib/locale/locale-archive" \
${stdenv.lib.optionalString (!legacy) ''"''${gappsWrapperArgs[@]}"''} ${stdenv.lib.optionalString (!usesGtk2) ''"''${gappsWrapperArgs[@]}"''}
# Without this, plugin_host crashes, even though it has the rpath # Without this, plugin_host crashes, even though it has the rpath
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 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
''; '';
}; };
in stdenv.mkDerivation (rec { in stdenv.mkDerivation (rec {
name = "sublimetext3-${buildVersion}"; inherit pname;
version = buildVersion;
phases = [ "installPhase" ]; phases = [ "installPhase" ];
inherit sublime; ${primaryBinary} = binaryPackage;
nativeBuildInputs = [ makeWrapper ];
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p "$out/bin"
makeWrapper "''$${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}"
cat > $out/bin/subl <<-EOF '' + builtins.concatStringsSep "" (map (binaryAlias: "ln -s $out/bin/${primaryBinary} $out/bin/${binaryAlias}\n") primaryBinaryAliases) + ''
#!${runtimeShell} mkdir -p "$out/share/applications"
exec $sublime/sublime_text "\$@" substitute "''$${primaryBinary}/${primaryBinary}.desktop" "$out/share/applications/${primaryBinary}.desktop" --replace "/opt/${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}"
EOF for directory in ''$${primaryBinary}/Icon/*; do
chmod +x $out/bin/subl size=$(basename $directory)
mkdir -p "$out/share/icons/hicolor/$size/apps"
ln $out/bin/subl $out/bin/sublime ln -s ''$${primaryBinary}/Icon/$size/* $out/share/icons/hicolor/$size/apps
ln $out/bin/subl $out/bin/sublime3 done
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
''; '';
passthru.updateScript = writeScript "sublime3-update-script" '' passthru.updateScript = writeScript "${pname}-update-script" ''
#!${stdenv.shell} #!${stdenv.shell}
set -o errexit set -o errexit
PATH=${stdenv.lib.makeBinPath [ common-updater-scripts curl gnugrep ]} PATH=${stdenv.lib.makeBinPath [ common-updater-scripts curl gnugrep ]}
latestVersion=$(curl https://www.sublimetext.com/3${stdenv.lib.optionalString dev "dev"} | grep -Po '(?<=<p class="latest"><i>Version:</i> Build )([0-9]+)') latestVersion=$(curl -s ${versionUrl} | grep -Po '(?<=<p class="latest"><i>Version:</i> Build )([0-9]+)')
for platform in ${stdenv.lib.concatStringsSep " " meta.platforms}; do for platform in ${stdenv.lib.concatStringsSep " " meta.platforms}; do
package=sublime3${stdenv.lib.optionalString dev "-dev"}
# The script will not perform an update when the version attribute is up to date from previous platform run # The script will not perform an update when the version attribute is up to date from previous platform run
# We need to clear it before each run # We need to clear it before each run
update-source-version ''${package}.sublime 0 0000000000000000000000000000000000000000000000000000000000000000 --file=pkgs/applications/editors/sublime/3/packages.nix --version-key=buildVersion --system=$platform update-source-version ${packageAttribute}.${primaryBinary} 0 0000000000000000000000000000000000000000000000000000000000000000 --file=${versionFile} --version-key=buildVersion --system=$platform
update-source-version ''${package}.sublime $latestVersion --file=pkgs/applications/editors/sublime/3/packages.nix --version-key=buildVersion --system=$platform update-source-version ${packageAttribute}.${primaryBinary} $latestVersion --file=${versionFile} --version-key=buildVersion --system=$platform
done done
''; '';

72
pkgs/applications/version-management/sublime-merge/common.nix
View File

@ -1,6 +1,6 @@
{ buildVersion, sha256, dev ? false }: { buildVersion, sha256, dev ? false }:
{ fetchurl, stdenv, xorg, glib, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook { fetchurl, stdenv, xorg, glib, glibcLocales, gtk2, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook
, pkexecPath ? "/run/wrappers/bin/pkexec", gksuSupport ? false, gksu , pkexecPath ? "/run/wrappers/bin/pkexec", gksuSupport ? false, gksu
, writeScript, common-updater-scripts, curl, gnugrep , writeScript, common-updater-scripts, curl, gnugrep
}: }:
@ -8,38 +8,50 @@
assert gksuSupport -> gksu != null; assert gksuSupport -> gksu != null;
let let
libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango ]; pname = "sublime-merge";
packageAttribute = "sublime-merge${stdenv.lib.optionalString dev "-dev"}";
binaries = [ "sublime_merge" "crash_reporter" "git-credential-sublime" "ssh-askpass-sublime" ];
primaryBinary = "sublime_merge";
primaryBinaryAliases = [ "smerge" ];
downloadUrl = "https://download.sublimetext.com/sublime_merge_build_${buildVersion}_${arch}.tar.xz";
downloadArchiveType = "tar.xz";
versionUrl = "https://www.sublimemerge.com/${if dev then "dev" else "download"}";
versionFile = "pkgs/applications/version-management/sublime-merge/default.nix";
usesGtk2 = false;
archSha256 = sha256;
arch = "x64";
libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib (if usesGtk2 then gtk2 else gtk3) cairo pango ];
redirects = [ "/usr/bin/pkexec=${pkexecPath}" ] redirects = [ "/usr/bin/pkexec=${pkexecPath}" ]
++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo"; ++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo";
in let in let
# package with just the binaries binaryPackage = stdenv.mkDerivation {
sublime_merge = stdenv.mkDerivation { pname = "${pname}-bin";
pname = "sublime-merge-bin";
version = buildVersion; version = buildVersion;
src = fetchurl { src = fetchurl {
name = "sublime-merge-${buildVersion}.tar.xz"; name = "${pname}-bin-${buildVersion}.${downloadArchiveType}";
url = "https://download.sublimetext.com/sublime_merge_build_${buildVersion}_x64.tar.xz"; url = downloadUrl;
inherit sha256; sha256 = archSha256;
}; };
dontStrip = true; dontStrip = true;
dontPatchELF = true; dontPatchELF = true;
buildInputs = [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH buildInputs = stdenv.lib.optionals (!usesGtk2) [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH
nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; nativeBuildInputs = [ makeWrapper ] ++ stdenv.lib.optional (!usesGtk2) wrapGAppsHook;
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
for binary in sublime_merge crash_reporter git-credential-sublime ssh-askpass-sublime; do for binary in ${ builtins.concatStringsSep " " binaries }; do
patchelf \ patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib64 \ --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \
$binary $binary
done done
# Rewrite pkexec|gksudo argument. Note that we can't delete bytes in binary. # Rewrite pkexec|gksudo argument. Note that we can't delete bytes in binary.
sed -i -e 's,/bin/cp\x00,cp\x00\x00\x00\x00\x00\x00,g' sublime_merge sed -i -e 's,/bin/cp\x00,cp\x00\x00\x00\x00\x00\x00,g' ${primaryBinary}
runHook postBuild runHook postBuild
''; '';
@ -56,43 +68,49 @@ in let
dontWrapGApps = true; # non-standard location, need to wrap the executables manually dontWrapGApps = true; # non-standard location, need to wrap the executables manually
postFixup = '' postFixup = ''
wrapProgram $out/sublime_merge \ wrapProgram $out/${primaryBinary} \
--set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
--set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects} \ --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects} \
"''${gappsWrapperArgs[@]}" --set LOCALE_ARCHIVE "${glibcLocales.out}/lib/locale/locale-archive" \
${stdenv.lib.optionalString (!usesGtk2) ''"''${gappsWrapperArgs[@]}"''}
''; '';
}; };
in stdenv.mkDerivation { in stdenv.mkDerivation (rec {
pname = "sublime-merge"; inherit pname;
version = buildVersion; version = buildVersion;
phases = [ "installPhase" ]; phases = [ "installPhase" ];
inherit sublime_merge; ${primaryBinary} = binaryPackage;
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
installPhase = '' installPhase = ''
mkdir -p "$out/bin" mkdir -p "$out/bin"
makeWrapper "$sublime_merge/sublime_merge" "$out/bin/sublime_merge" makeWrapper "''$${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}"
ln -s "$out/bin/sublime_merge" "$out/bin/smerge" '' + builtins.concatStringsSep "" (map (binaryAlias: "ln -s $out/bin/${primaryBinary} $out/bin/${binaryAlias}\n") primaryBinaryAliases) + ''
mkdir -p "$out/share/applications" mkdir -p "$out/share/applications"
substitute "$sublime_merge/sublime_merge.desktop" "$out/share/applications/sublime_merge.desktop" --replace "/opt/sublime_merge/sublime_merge" "$out/bin/sublime_merge" substitute "''$${primaryBinary}/${primaryBinary}.desktop" "$out/share/applications/${primaryBinary}.desktop" --replace "/opt/${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}"
for directory in $sublime_merge/Icon/*; do for directory in ''$${primaryBinary}/Icon/*; do
size=$(basename $directory) size=$(basename $directory)
mkdir -p "$out/share/icons/hicolor/$size/apps" mkdir -p "$out/share/icons/hicolor/$size/apps"
ln -s "$sublime_merge/Icon/$size/sublime-merge.png" "$out/share/icons/hicolor/$size/apps" ln -s ''$${primaryBinary}/Icon/$size/* $out/share/icons/hicolor/$size/apps
done done
''; '';
passthru.updateScript = writeScript "sublime-merge-update-script" '' passthru.updateScript = writeScript "${pname}-update-script" ''
#!${stdenv.shell} #!${stdenv.shell}
set -o errexit set -o errexit
PATH=${stdenv.lib.makeBinPath [ common-updater-scripts curl gnugrep ]} PATH=${stdenv.lib.makeBinPath [ common-updater-scripts curl gnugrep ]}
latestVersion=$(curl -s https://www.sublimemerge.com/${if dev then "dev" else "download"} | grep -Po '(?<=<p class="latest"><i>Version:</i> Build )([0-9]+)') latestVersion=$(curl -s ${versionUrl} | grep -Po '(?<=<p class="latest"><i>Version:</i> Build )([0-9]+)')
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 for platform in ${stdenv.lib.concatStringsSep " " meta.platforms}; do
# The script will not perform an update when the version attribute is up to date from previous platform run
# We need to clear it before each run
update-source-version ${packageAttribute}.${primaryBinary} 0 0000000000000000000000000000000000000000000000000000000000000000 --file=${versionFile} --version-key=buildVersion --system=$platform
update-source-version ${packageAttribute}.${primaryBinary} $latestVersion --file=${versionFile} --version-key=buildVersion --system=$platform
done
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -102,4 +120,4 @@ in stdenv.mkDerivation {
license = licenses.unfree; license = licenses.unfree;
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
}; };
} })