From 755d7d88833083167c86447c9b63ac74f71f9c47 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sat, 24 Apr 2010 19:09:33 +0000 Subject: [PATCH] conkeror: Switched to zip snapshots, because tarballs are different on every fetchurl. svn path=/nixpkgs/trunk/; revision=21298 --- pkgs/applications/networking/browsers/conkeror/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix index e0d62792918..d7e87e4015b 100644 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, unzip }: stdenv.mkDerivation { name = "conkeror-0.9.2"; src = fetchurl { - url = http://repo.or.cz/w/conkeror.git/snapshot/efacc207b0d6c7b3899fc584c9f48547b18da076.tar.gz; - sha256 = "179rkf32p83dzgfjghc4kglb03h8aivddliynsydr6zxy8c4p28f"; + url = http://repo.or.cz/w/conkeror.git/snapshot/efacc207b0d6c7b3899fc584c9f48547b18da076.zip; + sha256 = "1bkrrskrmhpx2xp90zgi5jrz4akynkxv2nzk5hzg0a17ikdi5ql8"; }; + buildInputs = [ unzip ]; installPhase = '' cp -r . $out ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9165223fda..22224a4daa5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7032,7 +7032,7 @@ let conkeror = xulrunnerWrapper { launcher = "conkeror"; application = import ../applications/networking/browsers/conkeror { - inherit stdenv fetchurl; + inherit stdenv fetchurl unzip; }; };