diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-05-29 00:26:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-29 00:26:47 +0200 |
commit | 30b410803830f03c5ef154a2101b42659e632b9f (patch) | |
tree | d40e049f7366653e6d01a9e801b07a2f6ea85a01 /pkgs/applications | |
parent | 8c5f4b8a3b1957c7c1919658bae1a4b5caf759b7 (diff) | |
parent | 4523f8e9f0f0d5eac1880e22ad82436d0be8f344 (diff) | |
download | nixlib-30b410803830f03c5ef154a2101b42659e632b9f.tar nixlib-30b410803830f03c5ef154a2101b42659e632b9f.tar.gz nixlib-30b410803830f03c5ef154a2101b42659e632b9f.tar.bz2 nixlib-30b410803830f03c5ef154a2101b42659e632b9f.tar.lz nixlib-30b410803830f03c5ef154a2101b42659e632b9f.tar.xz nixlib-30b410803830f03c5ef154a2101b42659e632b9f.tar.zst nixlib-30b410803830f03c5ef154a2101b42659e632b9f.zip |
Merge pull request #88952 from victorluft/smerge
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/version-management/sublime-merge/common.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/version-management/sublime-merge/default.nix | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index 173333fb75c7..f20ebbeae3f9 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -1,6 +1,6 @@ { 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" , writeScript, common-updater-scripts, curl, gnugrep, coreutils }: @@ -40,7 +40,7 @@ in let for binary in ${ builtins.concatStringsSep " " binaries }; do patchelf \ --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 done diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index 2734028866e7..a8fb944319cc 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -4,13 +4,13 @@ let common = opts: callPackage (import ./common.nix opts); in { sublime-merge = common { - buildVersion = "1116"; - sha256 = "0cwvn47dv0sg8cp8i3njmp4p58c6wjv6g75g09igx25waysn9cx6"; + buildVersion = "2020"; + sha256 = "0r5qqappaiicc4srk08az2vx42m7b6a75yn2ji5pv4w4085hlrzp"; } {}; sublime-merge-dev = common { - buildVersion = "1115"; - sha256 = "0dwgc9libqipwdgdc84maj1i3c8hbadz2318x1pibl6hbqy15bxl"; + buildVersion = "2011"; + sha256 = "0r5qqappaiicc4srk08az2vx42m7b6a75yn2ji5pv4w4085hlrzp"; dev = true; } {}; } |