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

Move qt3/qt4 choice to .nix expressions

Browse Source 
svn path=/nixpkgs/trunk/; revision=29404
This commit is contained in:
Yury G. Kudryashov 2011-09-20 22:49:13 +00:00
parent d9ad31c468
commit 9ee5230537
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/science/electronics/qucs/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, qt, libX11}:
{stdenv, fetchurl, qt3, libX11}:
stdenv.mkDerivation rec {
name = "qucs-0.0.15";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0ggs2nicj8q270l0rbmzg4jc0d0zdxvfsjh4wgww670ma5855xsp";
};
buildInputs = [ qt libX11 ];
buildInputs = [ qt3 libX11 ];
meta = {
description = "Integrated circuit simulator";

6
pkgs/tools/text/qshowdiff/default.nix
View File

@ -1,14 +1,14 @@
{stdenv, fetchurl, qt, perl}:
{stdenv, fetchurl, qt4, perl}:
stdenv.mkDerivation rec {
name = "qshowdiff-1.2";
src = fetchurl {
url = http://qshowdiff.danfis.cz/files/qshowdiff-1.2.tar.gz;
url = "http://qshowdiff.danfis.cz/files/${name}.tar.gz";
sha256 = "0i3ssvax4xync9c53jaxribazvh8d8v148l3yiqsfjmqsggw9rh3";
};
buildInputs = [ qt perl ];
buildInputs = [ qt4 perl ];
configurePhase = ''
ensureDir $out/{bin,man/man1}

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

@ -1216,9 +1216,7 @@ let
qhull = callPackage ../development/libraries/qhull { };
qshowdiff = callPackage ../tools/text/qshowdiff {
qt = qt4;
};
qshowdiff = callPackage ../tools/text/qshowdiff { };
radvd = callPackage ../tools/networking/radvd { };
@ -8130,9 +8128,7 @@ let
ngspice = callPackage ../applications/science/electronics/ngspice { };
qucs = callPackage ../applications/science/electronics/qucs {
qt = qt3;
};
qucs = callPackage ../applications/science/electronics/qucs { };
xoscope = callPackage ../applications/science/electronics/xoscope { };