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

Merge pull request #36240 from womfoo/fix-bump/conkeror-1.0.4

Browse Source 
conkeror: use firefox-esr, 1.0.3 -> 1.0.4
This commit is contained in:
Jörg Thalheim 2018-03-03 18:02:22 +00:00 committed by GitHub
commit ee735ff1f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/networking/browsers/conkeror/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchgit, unzip, firefox, makeWrapper }: { stdenv, fetchgit, unzip, firefox-esr, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pkgname = "conkeror"; pkgname = "conkeror";
version = "1.0.3"; version = "1.0.4";
name = "${pkgname}-${version}"; name = "${pkgname}-${version}";
src = fetchgit { src = fetchgit {
url = git://repo.or.cz/conkeror.git; url = git://repo.or.cz/conkeror.git;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
sha256 = "06fhfk8km3gd1lc19543zn0c71zfbn8wsalinvm1dbgi724f52pd"; sha256 = "10c57wqybp9kcjpkb01wxq0h3vafcdb1g5kb4k8sb2zajg59afv8";
}; };
buildInputs = [ unzip makeWrapper ]; buildInputs = [ unzip makeWrapper ];
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/libexec/conkeror mkdir -p $out/libexec/conkeror
cp -r * $out/libexec/conkeror cp -r * $out/libexec/conkeror
makeWrapper ${firefox}/bin/firefox $out/bin/conkeror \ makeWrapper ${firefox-esr}/bin/firefox $out/bin/conkeror \
--add-flags "-app $out/libexec/conkeror/application.ini" --add-flags "-app $out/libexec/conkeror/application.ini"
''; '';