Move qt3/qt4 choice to .nix expressions
svn path=/nixpkgs/trunk/; revision=29404
This commit is contained in:
parent
d9ad31c468
commit
9ee5230537
@ -1,4 +1,4 @@
|
|||||||
{stdenv, fetchurl, qt, libX11}:
|
{stdenv, fetchurl, qt3, libX11}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "qucs-0.0.15";
|
name = "qucs-0.0.15";
|
||||||
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "0ggs2nicj8q270l0rbmzg4jc0d0zdxvfsjh4wgww670ma5855xsp";
|
sha256 = "0ggs2nicj8q270l0rbmzg4jc0d0zdxvfsjh4wgww670ma5855xsp";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ qt libX11 ];
|
buildInputs = [ qt3 libX11 ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Integrated circuit simulator";
|
description = "Integrated circuit simulator";
|
||||||
|
@ -1,14 +1,14 @@
|
|||||||
{stdenv, fetchurl, qt, perl}:
|
{stdenv, fetchurl, qt4, perl}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "qshowdiff-1.2";
|
name = "qshowdiff-1.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://qshowdiff.danfis.cz/files/qshowdiff-1.2.tar.gz;
|
url = "http://qshowdiff.danfis.cz/files/${name}.tar.gz";
|
||||||
sha256 = "0i3ssvax4xync9c53jaxribazvh8d8v148l3yiqsfjmqsggw9rh3";
|
sha256 = "0i3ssvax4xync9c53jaxribazvh8d8v148l3yiqsfjmqsggw9rh3";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ qt perl ];
|
buildInputs = [ qt4 perl ];
|
||||||
|
|
||||||
configurePhase = ''
|
configurePhase = ''
|
||||||
ensureDir $out/{bin,man/man1}
|
ensureDir $out/{bin,man/man1}
|
||||||
|
@ -1216,9 +1216,7 @@ let
|
|||||||
|
|
||||||
qhull = callPackage ../development/libraries/qhull { };
|
qhull = callPackage ../development/libraries/qhull { };
|
||||||
|
|
||||||
qshowdiff = callPackage ../tools/text/qshowdiff {
|
qshowdiff = callPackage ../tools/text/qshowdiff { };
|
||||||
qt = qt4;
|
|
||||||
};
|
|
||||||
|
|
||||||
radvd = callPackage ../tools/networking/radvd { };
|
radvd = callPackage ../tools/networking/radvd { };
|
||||||
|
|
||||||
@ -8130,9 +8128,7 @@ let
|
|||||||
|
|
||||||
ngspice = callPackage ../applications/science/electronics/ngspice { };
|
ngspice = callPackage ../applications/science/electronics/ngspice { };
|
||||||
|
|
||||||
qucs = callPackage ../applications/science/electronics/qucs {
|
qucs = callPackage ../applications/science/electronics/qucs { };
|
||||||
qt = qt3;
|
|
||||||
};
|
|
||||||
|
|
||||||
xoscope = callPackage ../applications/science/electronics/xoscope { };
|
xoscope = callPackage ../applications/science/electronics/xoscope { };
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user