diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
| commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
| tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/applications/editors/sublime/2/default.nix | |
| parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
| parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
| download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip | |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/editors/sublime/2/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/editors/sublime/2/default.nix | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/applications/editors/sublime/2/default.nix b/nixpkgs/pkgs/applications/editors/sublime/2/default.nix index 7102d6951390..7f14bf8ae14b 100644 --- a/nixpkgs/pkgs/applications/editors/sublime/2/default.nix +++ b/nixpkgs/pkgs/applications/editors/sublime/2/default.nix @@ -1,26 +1,28 @@ { fetchurl, lib, stdenv, glib, xorg, cairo, gtk2, makeDesktopItem }: let - libPath = lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo]; + libPath = lib.makeLibraryPath [ glib xorg.libX11 gtk2 cairo ]; in stdenv.mkDerivation rec { - name = "sublimetext-2.0.2"; + pname = "sublimetext"; + version = "2.0.2"; + src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - name = "sublimetext-2.0.2.tar.bz2"; + name = "sublimetext-${version}.tar.bz2"; urls = [ - "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2" - "https://download.sublimetext.com/Sublime%20Text%202.0.2.tar.bz2" + "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%20${version}.tar.bz2" + "https://download.sublimetext.com/Sublime%20Text%20${version}.tar.bz2" ]; sha256 = "026g5mppk28lzzzn9ibykcqkrd5msfmg0sc0z8w8jd7v3h28wcq7"; } else fetchurl { - name = "sublimetext-2.0.2.tar.bz2"; + name = "sublimetext-${version}.tar.bz2"; urls = [ - "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2" - "https://download.sublimetext.com/Sublime%20Text%202.0.2%20x64.tar.bz2" + "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%20${version}.tar.bz2" + "https://download.sublimetext.com/Sublime%20Text%20${version}%20x64.tar.bz2" ]; sha256 = "115b71nbv9mv8cz6bkjwpbdf2ywnjc1zy2d3080f6ck4sqqfvfh1"; }; |