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

cb2bib: don't use qt.full

This commit is contained in:
Nikolay Amiantov 2017-02-03 18:20:06 +03:00
parent 2c7e3f276d
commit f0564ae299
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/office/cb2bib/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, qt5Full, lzo, libX11 }:
{ stdenv, fetchurl, qmakeHook, qtbase, qtwebkit, qtx11extras, lzo, libX11 }:
stdenv.mkDerivation rec {
name = pname + "-" + version;
@ -8,10 +8,13 @@ stdenv.mkDerivation rec {
url = "http://www.molspaces.com/dl/progs/${name}.tar.gz";
sha256 = "0yz79v023w1229wzck3gij0iqah1xg8rg4a352q8idvg7bdmyfin";
};
buildInputs = [ qt5Full lzo libX11 ];
QTDIR=qt5Full;
configurePhase =''
./configure --prefix $out
buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ];
nativeBuildInputs = [ qmakeHook ];
configurePhase = ''
runHook preConfigure
./configure --prefix $out --qmakepath $QMAKE
runHook postConfigure
'';
meta = with stdenv.lib; {
@ -21,4 +24,4 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
};
}
}

4
pkgs/top-level/all-packages.nix
View File

@ -12627,9 +12627,7 @@ with pkgs;
cava = callPackage ../applications/audio/cava { };
cb2bib = callPackage ../applications/office/cb2bib {
inherit (xorg) libX11;
};
cb2bib = qt5.callPackage ../applications/office/cb2bib { };
cbatticon = callPackage ../applications/misc/cbatticon { };