mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2025-01-02 17:09:09 +03:00
Merge pull request #65110 from worldofpeace/smerge-update
sublime-merge: 1107 -> 1116, sublime-merge-dev: 1111 -> 1115
This commit is contained in:
commit
ee5bcfff93
@ -2,7 +2,7 @@
|
||||
|
||||
{ fetchurl, stdenv, xorg, glib, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook
|
||||
, pkexecPath ? "/run/wrappers/bin/pkexec"
|
||||
, writeScript, common-updater-scripts, curl, gnugrep
|
||||
, writeScript, common-updater-scripts, curl, gnugrep, coreutils
|
||||
}:
|
||||
|
||||
let
|
||||
@ -18,7 +18,7 @@ let
|
||||
arch = "x64";
|
||||
|
||||
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
|
||||
binaryPackage = stdenv.mkDerivation {
|
||||
pname = "${pname}-bin";
|
||||
|
@ -4,13 +4,13 @@ let
|
||||
common = opts: callPackage (import ./common.nix opts);
|
||||
in {
|
||||
sublime-merge = common {
|
||||
buildVersion = "1107";
|
||||
sha256 = "70edbb16529d638ea41a694dbc5b1408c76fcc3a7d663ef0e48b4e89e1f19c71";
|
||||
buildVersion = "1116";
|
||||
sha256 = "0cwvn47dv0sg8cp8i3njmp4p58c6wjv6g75g09igx25waysn9cx6";
|
||||
} {};
|
||||
|
||||
sublime-merge-dev = common {
|
||||
buildVersion = "1111";
|
||||
sha256 = "d287b77b36febe52623db4546bef978dceb0654257b9a70c798d9cd394305c0d";
|
||||
buildVersion = "1115";
|
||||
sha256 = "0dwgc9libqipwdgdc84maj1i3c8hbadz2318x1pibl6hbqy15bxl";
|
||||
dev = true;
|
||||
} {};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user