diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-18 14:59:45 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-24 16:49:06 -0600 |
| commit | b4ba042924ca1ac14ac694c12d182f29efdc3aa9 (patch) | |
| tree | 43392ba2b9a936d59b9b2dd233a3a928b3969206 | |
| parent | 7b17c83cbedcd53daa2aace5cd0d184adf364260 (diff) | |
| download | nixpkgs-b4ba042924ca1ac14ac694c12d182f29efdc3aa9.tar nixpkgs-b4ba042924ca1ac14ac694c12d182f29efdc3aa9.tar.gz nixpkgs-b4ba042924ca1ac14ac694c12d182f29efdc3aa9.tar.bz2 nixpkgs-b4ba042924ca1ac14ac694c12d182f29efdc3aa9.tar.lz nixpkgs-b4ba042924ca1ac14ac694c12d182f29efdc3aa9.tar.xz nixpkgs-b4ba042924ca1ac14ac694c12d182f29efdc3aa9.tar.zst nixpkgs-b4ba042924ca1ac14ac694c12d182f29efdc3aa9.zip | |
qt4: Don't pass top-level attribute through kde4
| -rw-r--r-- | pkgs/applications/audio/jackmix/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/applications/science/robotics/gazebo/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/kde-4.14/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 8 insertions, 10 deletions
diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix index 8176a340470..e9e3fd53e54 100644 --- a/pkgs/applications/audio/jackmix/default.nix +++ b/pkgs/applications/audio/jackmix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgs, jack ? pkgs.libjack2 }: +{ stdenv, fetchurl, pkgconfig, scons, qt4, lash, libjack2, jack ? libjack2 }: stdenv.mkDerivation rec { name = "jackmix-0.5.2"; @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgs.pkgconfig - pkgs.scons - pkgs.kde4.qt4 - pkgs.lash + pkgconfig + scons + qt4 + lash jack ]; diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/pkgs/applications/science/robotics/gazebo/default.nix index e8b3bcb16a2..6cefb156d1d 100644 --- a/pkgs/applications/science/robotics/gazebo/default.nix +++ b/pkgs/applications/science/robotics/gazebo/default.nix @@ -5,7 +5,7 @@ , pythonPackages, utillinux # 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 , libav, withLibAvSupport ? true , openal, withAudioSupport ? false @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { curl tinyxml x11 - kde4.qt4 + qt4 ] ++ optional stdenv.isLinux utillinux # on Linux needs uuid/uuid.h ++ optional withDocs doxygen ++ optional withLibAvSupport libav #TODO: package rubygem-ronn and put it here diff --git a/pkgs/desktops/kde-4.14/default.nix b/pkgs/desktops/kde-4.14/default.nix index d65f38b8cd1..9c730ef39cf 100644 --- a/pkgs/desktops/kde-4.14/default.nix +++ b/pkgs/desktops/kde-4.14/default.nix @@ -29,8 +29,6 @@ kde.modules // kde.individual // akonadi = callPackage ./support/akonadi { }; - qt4 = qt48; - inherit release; l10n = callPackage ./l10n { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99b4176596b..6c4221a5150 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9242,7 +9242,7 @@ with pkgs; libpng = libpng12; }; - qt4 = pkgs.kde4.qt4; + qt4 = qt48; qt48 = callPackage ../development/libraries/qt-4.x/4.8 { # GNOME dependencies are not used unless gtkStyle == true |