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

Merge pull request #65110 from worldofpeace/smerge-update

Browse Source 
sublime-merge: 1107 -> 1116,  sublime-merge-dev: 1111 -> 1115
This commit is contained in:
worldofpeace 2019-07-20 21:11:19 -04:00 committed by GitHub
commit ee5bcfff93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
{ fetchurl, stdenv, xorg, glib, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook { fetchurl, stdenv, xorg, glib, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook
, pkexecPath ? "/run/wrappers/bin/pkexec" , pkexecPath ? "/run/wrappers/bin/pkexec"
, writeScript, common-updater-scripts, curl, gnugrep , writeScript, common-updater-scripts, curl, gnugrep, coreutils
}: }:
let let
@ -18,7 +18,7 @@ let
arch = "x64"; arch = "x64";
libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango ]; libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango ];
redirects = [ "/usr/bin/pkexec=${pkexecPath}" ]; redirects = [ "/usr/bin/pkexec=${pkexecPath}" "/bin/true=${coreutils}/bin/true" ];
in let in let
binaryPackage = stdenv.mkDerivation { binaryPackage = stdenv.mkDerivation {
pname = "${pname}-bin"; pname = "${pname}-bin";

8
pkgs/applications/version-management/sublime-merge/default.nix
View File

@ -4,13 +4,13 @@ let
common = opts: callPackage (import ./common.nix opts); common = opts: callPackage (import ./common.nix opts);
in { in {
sublime-merge = common { sublime-merge = common {
buildVersion = "1107"; buildVersion = "1116";
sha256 = "70edbb16529d638ea41a694dbc5b1408c76fcc3a7d663ef0e48b4e89e1f19c71"; sha256 = "0cwvn47dv0sg8cp8i3njmp4p58c6wjv6g75g09igx25waysn9cx6";
} {}; } {};
sublime-merge-dev = common { sublime-merge-dev = common {
buildVersion = "1111"; buildVersion = "1115";
sha256 = "d287b77b36febe52623db4546bef978dceb0654257b9a70c798d9cd394305c0d"; sha256 = "0dwgc9libqipwdgdc84maj1i3c8hbadz2318x1pibl6hbqy15bxl";
dev = true; dev = true;
} {}; } {};
} }