diff options
author | Tim Steinbach <tim@nequissimus.com> | 2016-04-29 01:05:41 +0000 |
---|---|---|
committer | Tim Steinbach <tim@nequissimus.com> | 2016-04-29 01:19:15 +0000 |
commit | 1142b402a84b9eab3309d60c00739ae73d42673e (patch) | |
tree | 47d1e18782229c40dd07830bf94f9e5ee1041865 /pkgs/applications | |
parent | 25290a9f15b081a24a5f515792373bbc41bd982a (diff) | |
download | nixlib-1142b402a84b9eab3309d60c00739ae73d42673e.tar nixlib-1142b402a84b9eab3309d60c00739ae73d42673e.tar.gz nixlib-1142b402a84b9eab3309d60c00739ae73d42673e.tar.bz2 nixlib-1142b402a84b9eab3309d60c00739ae73d42673e.tar.lz nixlib-1142b402a84b9eab3309d60c00739ae73d42673e.tar.xz nixlib-1142b402a84b9eab3309d60c00739ae73d42673e.tar.zst nixlib-1142b402a84b9eab3309d60c00739ae73d42673e.zip |
vivaldi: Clean up
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/networking/browsers/vivaldi/default.nix | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 6028bb1fe07f..2c6ba3f89290 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -10,25 +10,25 @@ }: let - archUrl = name: arch: "https://downloads.vivaldi.com/stable/${name}_${arch}.deb"; -in -stdenv.mkDerivation rec { - version = "1.1"; - debversion = "stable_1.1.453.47-1"; - product = "vivaldi"; - name = "${product}-${version}"; + version = "1.1"; + build = "453.47-1"; + fullVersion = "stable_${version}.${build}"; - src = if stdenv.system == "x86_64-linux" - then fetchurl { - url = archUrl "vivaldi-${debversion}" "amd64"; + info = if stdenv.is64bit then { + arch = "amd64"; sha256 = "09kadsi4ydjciq092i6linapqzjdzx915zqmz7vfq6w1yp9mqbwq"; - } - else if stdenv.system == "i686-linux" - then fetchurl { - url = archUrl "vivaldi-${debversion}" "i386"; + } else { + arch = "i386"; sha256 = "0b5410phnkpg6sz0j345vdn0r6n89rm865bchqw8p4kx7pmy78z3"; - } - else throw "Vivaldi is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)"; + }; +in stdenv.mkDerivation rec { + product = "vivaldi"; + name = "${product}-${version}"; + + src = fetchurl { + inherit (info) sha256; + url = "https://downloads.vivaldi.com/stable/${product}-${fullVersion}_${info.arch}.deb"; + }; unpackPhase = '' ar vx ${src} @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ]; libPath = stdenv.lib.makeLibraryPath buildInputs - + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") + + stdenv.lib.optionalString (stdenv.is64bit) (":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs); buildPhase = '' @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { description = "A Browser for our Friends, powerful and personal"; homepage = "https://vivaldi.com"; license = licenses.unfree; - maintainers = with maintainers; [ otwieracz ]; + maintainers = with maintainers; [ otwieracz nequissimus ]; platforms = platforms.linux; }; } |