ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-16 18:37:04 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #88952 from victorluft/smerge

Browse Source
This commit is contained in:
Jan Tojnar 2020-05-29 00:26:47 +02:00 committed by GitHub
commit 30b4108038
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

@ -1,6 +1,6 @@
{ buildVersion, sha256, dev ? false }: { buildVersion, sha256, dev ? false }:
{ fetchurl, stdenv, xorg, glib, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook { fetchurl, stdenv, xorg, glib, libGL, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook
, pkexecPath ? "/run/wrappers/bin/pkexec" , pkexecPath ? "/run/wrappers/bin/pkexec"
, writeScript, common-updater-scripts, curl, gnugrep, coreutils , writeScript, common-updater-scripts, curl, gnugrep, coreutils
}: }:
@ -40,7 +40,7 @@ in let
for binary in ${ builtins.concatStringsSep " " binaries }; 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}:${libGL}/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \
$binary $binary
done done

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 = "1116"; buildVersion = "2020";
sha256 = "0cwvn47dv0sg8cp8i3njmp4p58c6wjv6g75g09igx25waysn9cx6"; sha256 = "0r5qqappaiicc4srk08az2vx42m7b6a75yn2ji5pv4w4085hlrzp";
} {}; } {};
sublime-merge-dev = common { sublime-merge-dev = common {
buildVersion = "1115"; buildVersion = "2011";
sha256 = "0dwgc9libqipwdgdc84maj1i3c8hbadz2318x1pibl6hbqy15bxl"; sha256 = "0r5qqappaiicc4srk08az2vx42m7b6a75yn2ji5pv4w4085hlrzp";
dev = true; dev = true;
} {}; } {};
} }