diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-06-19 00:52:04 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-19 00:52:04 +0200 |
commit | 897d9050a31f798a86d84f4f3881903604e8cb3a (patch) | |
tree | 093babd206894ced7a42a8844f3e72c26c7a3a66 /pkgs/applications/version-management | |
parent | ac070b89d43d5684ecbf8859aa8da57d08a9c4d8 (diff) | |
parent | b75a43f9e0bc525c9dbb601cb935f97c7d9f04fd (diff) | |
download | nixlib-897d9050a31f798a86d84f4f3881903604e8cb3a.tar nixlib-897d9050a31f798a86d84f4f3881903604e8cb3a.tar.gz nixlib-897d9050a31f798a86d84f4f3881903604e8cb3a.tar.bz2 nixlib-897d9050a31f798a86d84f4f3881903604e8cb3a.tar.lz nixlib-897d9050a31f798a86d84f4f3881903604e8cb3a.tar.xz nixlib-897d9050a31f798a86d84f4f3881903604e8cb3a.tar.zst nixlib-897d9050a31f798a86d84f4f3881903604e8cb3a.zip |
Merge pull request #63447 from jtojnar/sublime-cleanup
sublime3: clean up
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r-- | pkgs/applications/version-management/sublime-merge/common.nix | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index a232b78aacfd..f69fdbefe184 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -1,12 +1,10 @@ { buildVersion, sha256, dev ? false }: -{ fetchurl, stdenv, xorg, glib, glibcLocales, gtk2, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook -, pkexecPath ? "/run/wrappers/bin/pkexec", gksuSupport ? false, gksu +{ fetchurl, stdenv, xorg, glib, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook +, pkexecPath ? "/run/wrappers/bin/pkexec" , writeScript, common-updater-scripts, curl, gnugrep }: -assert gksuSupport -> gksu != null; - let pname = "sublime-merge"; packageAttribute = "sublime-merge${stdenv.lib.optionalString dev "-dev"}"; @@ -14,31 +12,27 @@ let 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; + versionFile = builtins.toString ./default.nix; archSha256 = sha256; arch = "x64"; - libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib (if usesGtk2 then gtk2 else gtk3) cairo pango ]; - redirects = [ "/usr/bin/pkexec=${pkexecPath}" ] - ++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo"; + libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango ]; + redirects = [ "/usr/bin/pkexec=${pkexecPath}" ]; in let binaryPackage = stdenv.mkDerivation { pname = "${pname}-bin"; version = buildVersion; src = fetchurl { - name = "${pname}-bin-${buildVersion}.${downloadArchiveType}"; url = downloadUrl; sha256 = archSha256; }; dontStrip = true; dontPatchELF = true; - buildInputs = stdenv.lib.optionals (!usesGtk2) [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH - nativeBuildInputs = [ makeWrapper ] ++ stdenv.lib.optional (!usesGtk2) wrapGAppsHook; + buildInputs = [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH + nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; buildPhase = '' runHook preBuild @@ -50,7 +44,7 @@ in let $binary 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} runHook postBuild @@ -72,7 +66,7 @@ in let --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects} \ --set LOCALE_ARCHIVE "${glibcLocales.out}/lib/locale/locale-archive" \ - ${stdenv.lib.optionalString (!usesGtk2) ''"''${gappsWrapperArgs[@]}"''} + "''${gappsWrapperArgs[@]}" ''; }; in stdenv.mkDerivation (rec { |