diff options
author | Nikolay Amiantov <ab@fmap.me> | 2017-02-03 18:20:06 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2017-02-03 18:21:15 +0300 |
commit | f0564ae299f7474a5555a841e1e2ffc2f2bef8ff (patch) | |
tree | 71151f15fb3062fed1e0e79e419b0476ac840c20 | |
parent | 2c7e3f276db83a8667723a72510f855dfe4ac87e (diff) | |
download | nixlib-f0564ae299f7474a5555a841e1e2ffc2f2bef8ff.tar nixlib-f0564ae299f7474a5555a841e1e2ffc2f2bef8ff.tar.gz nixlib-f0564ae299f7474a5555a841e1e2ffc2f2bef8ff.tar.bz2 nixlib-f0564ae299f7474a5555a841e1e2ffc2f2bef8ff.tar.lz nixlib-f0564ae299f7474a5555a841e1e2ffc2f2bef8ff.tar.xz nixlib-f0564ae299f7474a5555a841e1e2ffc2f2bef8ff.tar.zst nixlib-f0564ae299f7474a5555a841e1e2ffc2f2bef8ff.zip |
cb2bib: don't use qt.full
-rw-r--r-- | pkgs/applications/office/cb2bib/default.nix | 15 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 10 insertions, 9 deletions
diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix index aa246d241ca6..abff61b881fc 100644 --- a/pkgs/applications/office/cb2bib/default.nix +++ b/pkgs/applications/office/cb2bib/default.nix @@ -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; }; -} \ No newline at end of file +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f71d8a00b9b1..361b4408fd1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |