diff options
| author | Sven Keidel <svenkeidel@googlemail.com> | 2015-05-16 22:20:33 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-05-18 13:46:09 +0200 |
| commit | 22c8244605cd500d344142569b7d000aabdb8b10 (patch) | |
| tree | 1e8ae41dd036121f655976f641ace4c2f080788b | |
| parent | 12f0b619675d591bfef01e253cdb826eee509378 (diff) | |
| download | nixpkgs-22c8244605cd500d344142569b7d000aabdb8b10.tar nixpkgs-22c8244605cd500d344142569b7d000aabdb8b10.tar.gz nixpkgs-22c8244605cd500d344142569b7d000aabdb8b10.tar.bz2 nixpkgs-22c8244605cd500d344142569b7d000aabdb8b10.tar.lz nixpkgs-22c8244605cd500d344142569b7d000aabdb8b10.tar.xz nixpkgs-22c8244605cd500d344142569b7d000aabdb8b10.tar.zst nixpkgs-22c8244605cd500d344142569b7d000aabdb8b10.zip | |
zeal: update to 0.1.1 (close #7858)
| -rw-r--r-- | pkgs/data/documentation/zeal/default.nix | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 6b8399a8b3f..7bc1b9fa1fd 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -1,38 +1,26 @@ { stdenv, fetchFromGitHub, pkgconfig, qt5, libarchive }: stdenv.mkDerivation rec { - version = "20141123"; + version = "0.1.1"; name = "zeal-${version}"; src = fetchFromGitHub { owner = "zealdocs"; repo = "zeal"; - rev = "76405f8387d6a82697faab9630c78f31417d8450"; - sha256 = "1057py3j2flzxyiks031s0mwm9h82v033iqn5cq8sycmrb3ihj2s"; + rev = "v${version}"; + sha256 = "172wf50fq1l5p8hq1irvpwr7ljxkjaby71afrm82jz3ixl6dg2ii"; }; - buildInputs = [ pkgconfig qt5.base qt5.webkit libarchive ]; + buildInputs = [ pkgconfig qt5.base qt5.webkit qt5.imageformats libarchive ]; - patchPhase = '' - substituteInPlace src/main.cpp \ - --replace /usr/share/pixmaps/zeal $out/share/pixmaps/zeal - ''; - - buildPhase = '' - qmake PREFIX=$out - make + configurePhase = '' + qmake PREFIX=/ ''; installPhase = '' make INSTALL_ROOT=$out install ''; - preFixup = '' - mv $out/usr/bin $out/bin - mv $out/usr/share $out/share - rmdir $out/usr - ''; - enableParallelBuilding = true; meta = { |