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

Merge pull request #63447 from jtojnar/sublime-cleanup

Browse Source 
sublime3: clean up
This commit is contained in:
Jan Tojnar 2019-06-19 00:52:04 +02:00 committed by GitHub
commit 897d9050a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,13 +1,11 @@
{ buildVersion, x32sha256, x64sha256, dev ? false }: { buildVersion, x32sha256, x64sha256, dev ? false }:
{ fetchurl, stdenv, xorg, glib, glibcLocales, gtk2, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook { fetchurl, stdenv, xorg, glib, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook
, pkexecPath ? "/run/wrappers/bin/pkexec", gksuSupport ? false, gksu , pkexecPath ? "/run/wrappers/bin/pkexec"
, writeScript, common-updater-scripts, curl, gnugrep , writeScript, common-updater-scripts, curl, gnugrep
, openssl, bzip2, bash, unzip, zip , openssl, bzip2, bash, unzip, zip
}: }:
assert gksuSupport -> gksu != null;
let let
pname = "sublimetext3"; pname = "sublimetext3";
packageAttribute = "sublime3${stdenv.lib.optionalString dev "-dev"}"; packageAttribute = "sublime3${stdenv.lib.optionalString dev "-dev"}";
@ -15,10 +13,8 @@ let
primaryBinary = "sublime_text"; primaryBinary = "sublime_text";
primaryBinaryAliases = [ "subl" "sublime" "sublime3" ]; primaryBinaryAliases = [ "subl" "sublime" "sublime3" ];
downloadUrl = "https://download.sublimetext.com/sublime_text_3_build_${buildVersion}_${arch}.tar.bz2"; 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"}"; versionUrl = "https://www.sublimetext.com/${if dev then "3dev" else "3"}";
versionFile = "pkgs/applications/editors/sublime/3/packages.nix"; versionFile = builtins.toString ./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
@ -30,24 +26,22 @@ let
else else
"x64"; "x64";
libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib (if usesGtk2 then gtk2 else gtk3) cairo pango ]; libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango ];
redirects = [ "/usr/bin/pkexec=${pkexecPath}" ] redirects = [ "/usr/bin/pkexec=${pkexecPath}" ];
++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo";
in let in let
binaryPackage = stdenv.mkDerivation { binaryPackage = stdenv.mkDerivation {
pname = "${pname}-bin"; pname = "${pname}-bin";
version = buildVersion; version = buildVersion;
src = fetchurl { src = fetchurl {
name = "${pname}-bin-${buildVersion}.${downloadArchiveType}";
url = downloadUrl; url = downloadUrl;
sha256 = archSha256; sha256 = archSha256;
}; };
dontStrip = true; dontStrip = true;
dontPatchELF = true; dontPatchELF = true;
buildInputs = stdenv.lib.optionals (!usesGtk2) [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH buildInputs = [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH
nativeBuildInputs = [ zip unzip makeWrapper ] ++ stdenv.lib.optional (!usesGtk2) wrapGAppsHook; nativeBuildInputs = [ zip unzip makeWrapper wrapGAppsHook ];
# make exec.py in Default.sublime-package use own bash with an LD_PRELOAD instead of "/bin/bash" # make exec.py in Default.sublime-package use own bash with an LD_PRELOAD instead of "/bin/bash"
patchPhase = '' patchPhase = ''
@ -76,7 +70,7 @@ in let
$binary $binary
done done
# Rewrite pkexec|gksudo argument. Note that we can't delete bytes in binary. # Rewrite pkexec argument. Note that we cannot delete bytes in binary.
sed -i -e 's,/bin/cp\x00,cp\x00\x00\x00\x00\x00\x00,g' ${primaryBinary} sed -i -e 's,/bin/cp\x00,cp\x00\x00\x00\x00\x00\x00,g' ${primaryBinary}
runHook postBuild runHook postBuild
@ -105,7 +99,7 @@ in let
--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 (!usesGtk2) ''"''${gappsWrapperArgs[@]}"''} "''${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
@ -152,7 +146,7 @@ in stdenv.mkDerivation (rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Sophisticated text editor for code, markup and prose"; description = "Sophisticated text editor for code, markup and prose";
homepage = https://www.sublimetext.com/; homepage = https://www.sublimetext.com/;
maintainers = with maintainers; [ wmertens demin-dmitriy zimbatm ]; maintainers = with maintainers; [ jtojnar wmertens demin-dmitriy zimbatm ];
license = licenses.unfree; license = licenses.unfree;
platforms = [ "x86_64-linux" "i686-linux" ]; platforms = [ "x86_64-linux" "i686-linux" ];
}; };

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

@ -1,12 +1,10 @@
{ buildVersion, sha256, dev ? false }: { buildVersion, sha256, dev ? false }:
{ fetchurl, stdenv, xorg, glib, glibcLocales, gtk2, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook { fetchurl, stdenv, xorg, glib, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook
, pkexecPath ? "/run/wrappers/bin/pkexec", gksuSupport ? false, gksu , pkexecPath ? "/run/wrappers/bin/pkexec"
, writeScript, common-updater-scripts, curl, gnugrep , writeScript, common-updater-scripts, curl, gnugrep
}: }:
assert gksuSupport -> gksu != null;
let let
pname = "sublime-merge"; pname = "sublime-merge";
packageAttribute = "sublime-merge${stdenv.lib.optionalString dev "-dev"}"; packageAttribute = "sublime-merge${stdenv.lib.optionalString dev "-dev"}";
@ -14,31 +12,27 @@ let
primaryBinary = "sublime_merge"; primaryBinary = "sublime_merge";
primaryBinaryAliases = [ "smerge" ]; primaryBinaryAliases = [ "smerge" ];
downloadUrl = "https://download.sublimetext.com/sublime_merge_build_${buildVersion}_${arch}.tar.xz"; 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"}"; versionUrl = "https://www.sublimemerge.com/${if dev then "dev" else "download"}";
versionFile = "pkgs/applications/version-management/sublime-merge/default.nix"; versionFile = builtins.toString ./default.nix;
usesGtk2 = false;
archSha256 = sha256; archSha256 = sha256;
arch = "x64"; arch = "x64";
libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib (if usesGtk2 then gtk2 else gtk3) cairo pango ]; libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango ];
redirects = [ "/usr/bin/pkexec=${pkexecPath}" ] redirects = [ "/usr/bin/pkexec=${pkexecPath}" ];
++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo";
in let in let
binaryPackage = stdenv.mkDerivation { binaryPackage = stdenv.mkDerivation {
pname = "${pname}-bin"; pname = "${pname}-bin";
version = buildVersion; version = buildVersion;
src = fetchurl { src = fetchurl {
name = "${pname}-bin-${buildVersion}.${downloadArchiveType}";
url = downloadUrl; url = downloadUrl;
sha256 = archSha256; sha256 = archSha256;
}; };
dontStrip = true; dontStrip = true;
dontPatchELF = true; dontPatchELF = true;
buildInputs = stdenv.lib.optionals (!usesGtk2) [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH buildInputs = [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH
nativeBuildInputs = [ makeWrapper ] ++ stdenv.lib.optional (!usesGtk2) wrapGAppsHook; nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
@ -50,7 +44,7 @@ in let
$binary $binary
done done
# Rewrite pkexec|gksudo argument. Note that we can't delete bytes in binary. # Rewrite pkexec argument. Note that we cannot delete bytes in binary.
sed -i -e 's,/bin/cp\x00,cp\x00\x00\x00\x00\x00\x00,g' ${primaryBinary} sed -i -e 's,/bin/cp\x00,cp\x00\x00\x00\x00\x00\x00,g' ${primaryBinary}
runHook postBuild runHook postBuild
@ -72,7 +66,7 @@ in let
--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 (!usesGtk2) ''"''${gappsWrapperArgs[@]}"''} "''${gappsWrapperArgs[@]}"
''; '';
}; };
in stdenv.mkDerivation (rec { in stdenv.mkDerivation (rec {

13
pkgs/build-support/libredirect/libredirect.c
View File

@ -160,6 +160,19 @@ int posix_spawn(pid_t * pid, const char * path,
return posix_spawn_real(pid, rewrite(path, buf), file_actions, attrp, argv, envp); return posix_spawn_real(pid, rewrite(path, buf), file_actions, attrp, argv, envp);
} }
int posix_spawnp(pid_t * pid, const char * file,
const posix_spawn_file_actions_t * file_actions,
const posix_spawnattr_t * attrp,
char * const argv[], char * const envp[])
{
int (*posix_spawnp_real) (pid_t *, const char *,
const posix_spawn_file_actions_t *,
const posix_spawnattr_t *,
char * const argv[], char * const envp[]) = dlsym(RTLD_NEXT, "posix_spawnp");
char buf[PATH_MAX];
return posix_spawnp_real(pid, rewrite(file, buf), file_actions, attrp, argv, envp);
}
int execv(const char *path, char *const argv[]) int execv(const char *path, char *const argv[])
{ {
int (*execv_real) (const char *path, char *const argv[]) = dlsym(RTLD_NEXT, "execv"); int (*execv_real) (const char *path, char *const argv[]) = dlsym(RTLD_NEXT, "execv");