alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

qt4: Don't pass top-level attribute through kde4

Browse source
This commit is contained in:
Thomas Tuegel 2017-02-18 14:59:45 -06:00
parent 7b17c83cbe
commit b4ba042924
No known key found for this signature in database
GPG key ID: 22CBF5249D4B4D59
4 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/applications/audio/jackmix/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgs, jack ? pkgs.libjack2 }: { stdenv, fetchurl, pkgconfig, scons, qt4, lash, libjack2, jack ? libjack2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "jackmix-0.5.2"; name = "jackmix-0.5.2";
@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
pkgs.pkgconfig pkgconfig
pkgs.scons scons
pkgs.kde4.qt4 qt4
pkgs.lash lash
jack jack
]; ];

4
pkgs/applications/science/robotics/gazebo/default.nix
View file

@ -5,7 +5,7 @@
, pythonPackages, utillinux , pythonPackages, utillinux
# these deps are hidden; cmake doesn't catch them # these deps are hidden; cmake doesn't catch them
, gazeboSimulator, sdformat ? gazeboSimulator.sdformat, curl, tinyxml, kde4, x11 , gazeboSimulator, sdformat ? gazeboSimulator.sdformat, curl, tinyxml, qt4, x11
, withIgnitionTransport ? true , withIgnitionTransport ? true
, libav, withLibAvSupport ? true , libav, withLibAvSupport ? true
, openal, withAudioSupport ? false , openal, withAudioSupport ? false
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
curl curl
tinyxml tinyxml
x11 x11
kde4.qt4 qt4
] ++ optional stdenv.isLinux utillinux # on Linux needs uuid/uuid.h ] ++ optional stdenv.isLinux utillinux # on Linux needs uuid/uuid.h
++ optional withDocs doxygen ++ optional withDocs doxygen
++ optional withLibAvSupport libav #TODO: package rubygem-ronn and put it here ++ optional withLibAvSupport libav #TODO: package rubygem-ronn and put it here

2
pkgs/desktops/kde-4.14/default.nix
View file

@ -29,8 +29,6 @@ kde.modules // kde.individual //
akonadi = callPackage ./support/akonadi { }; akonadi = callPackage ./support/akonadi { };
qt4 = qt48;
inherit release; inherit release;
l10n = callPackage ./l10n { l10n = callPackage ./l10n {

2
pkgs/top-level/all-packages.nix
View file

@ -9242,7 +9242,7 @@ with pkgs;
libpng = libpng12; libpng = libpng12;
}; };
qt4 = pkgs.kde4.qt4; qt4 = qt48;
qt48 = callPackage ../development/libraries/qt-4.x/4.8 { qt48 = callPackage ../development/libraries/qt-4.x/4.8 {
# GNOME dependencies are not used unless gtkStyle == true # GNOME dependencies are not used unless gtkStyle == true