diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:33:16 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:33:16 +0000 |
| commit | 04551d263c8b22a07e5c82ee2982ba3caf2fffd8 (patch) | |
| tree | bac707d0f3f9ce332d9d93b8561d3fb957f72851 | |
| parent | 8e929441a9b4f5a0e3ef1d23487332fc46b5932b (diff) | |
| download | nixpkgs-04551d263c8b22a07e5c82ee2982ba3caf2fffd8.tar nixpkgs-04551d263c8b22a07e5c82ee2982ba3caf2fffd8.tar.gz nixpkgs-04551d263c8b22a07e5c82ee2982ba3caf2fffd8.tar.bz2 nixpkgs-04551d263c8b22a07e5c82ee2982ba3caf2fffd8.tar.lz nixpkgs-04551d263c8b22a07e5c82ee2982ba3caf2fffd8.tar.xz nixpkgs-04551d263c8b22a07e5c82ee2982ba3caf2fffd8.tar.zst nixpkgs-04551d263c8b22a07e5c82ee2982ba3caf2fffd8.zip | |
qt3: move defaults to package file
| -rw-r--r-- | pkgs/development/libraries/qt-3/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 3f3e9158622..dc05251478c 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -6,7 +6,8 @@ , cursorSupport ? true, libXcursor ? null , threadSupport ? true , mysqlSupport ? false, mysql ? null -, openglSupport ? false, libGLU_combined ? null, libXmu ? null +, libGLSupported +, openglSupport ? libGLSupported, libGLU_combined ? null, libXmu ? null , xlibsWrapper, xorgproto, zlib, libjpeg, libpng, which }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b89426b8cd0..487456ba58a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12099,7 +12099,6 @@ in qolibri = libsForQt5.callPackage ../applications/misc/qolibri { }; qt3 = callPackage ../development/libraries/qt-3 { - openglSupport = libGLSupported; libpng = libpng12; }; |