public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vivaldi: Clean up

Browse Source
This commit is contained in:
Tim Steinbach 2016-04-29 01:05:41 +00:00
parent 25290a9f15
commit 1142b402a8
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkgs/applications/networking/browsers/vivaldi/default.nix
View File

@ -10,25 +10,25 @@
}: }:
let let
archUrl = name: arch: "https://downloads.vivaldi.com/stable/${name}_${arch}.deb";
in
stdenv.mkDerivation rec {
version = "1.1"; version = "1.1";
debversion = "stable_1.1.453.47-1"; build = "453.47-1";
fullVersion = "stable_${version}.${build}";
info = if stdenv.is64bit then {
arch = "amd64";
sha256 = "09kadsi4ydjciq092i6linapqzjdzx915zqmz7vfq6w1yp9mqbwq";
} else {
arch = "i386";
sha256 = "0b5410phnkpg6sz0j345vdn0r6n89rm865bchqw8p4kx7pmy78z3";
};
in stdenv.mkDerivation rec {
product = "vivaldi"; product = "vivaldi";
name = "${product}-${version}"; name = "${product}-${version}";
src = if stdenv.system == "x86_64-linux" src = fetchurl {
then fetchurl { inherit (info) sha256;
url = archUrl "vivaldi-${debversion}" "amd64"; url = "https://downloads.vivaldi.com/stable/${product}-${fullVersion}_${info.arch}.deb";
sha256 = "09kadsi4ydjciq092i6linapqzjdzx915zqmz7vfq6w1yp9mqbwq"; };
}
else if stdenv.system == "i686-linux"
then fetchurl {
url = archUrl "vivaldi-${debversion}" "i386";
sha256 = "0b5410phnkpg6sz0j345vdn0r6n89rm865bchqw8p4kx7pmy78z3";
}
else throw "Vivaldi is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
unpackPhase = '' unpackPhase = ''
ar vx ${src} ar vx ${src}
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
]; ];
libPath = stdenv.lib.makeLibraryPath buildInputs libPath = stdenv.lib.makeLibraryPath buildInputs
+ stdenv.lib.optionalString (stdenv.system == "x86_64-linux") + stdenv.lib.optionalString (stdenv.is64bit)
(":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs); (":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs);
buildPhase = '' buildPhase = ''
@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
description = "A Browser for our Friends, powerful and personal"; description = "A Browser for our Friends, powerful and personal";
homepage = "https://vivaldi.com"; homepage = "https://vivaldi.com";
license = licenses.unfree; license = licenses.unfree;
maintainers = with maintainers; [ otwieracz ]; maintainers = with maintainers; [ otwieracz nequissimus ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }