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

Merge remote-tracking branch 'upstream/master' into openssl-1.1

Browse Source
This commit is contained in:
Robin Gloster
2019-08-21 14:25:13 +02:00
parent 9135412b63 609d408970
commit f4fc845e5b
1739 changed files with 138818 additions and 193118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/qt-5/5.11/default.nix
+3 -4
View File
@@ -9,9 +9,8 @@ top-level attribute to `top-level/all-packages.nix`.
1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`.
2. From the top of the Nixpkgs tree, run
`./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`.
3. Update `qtCompatVersion` below if the minor version number changes.
4. Check that the new packages build correctly.
5. Commit the changes and open a pull request.
3. Check that the new packages build correctly.
4. Commit the changes and open a pull request.
*/
@@ -32,7 +31,7 @@ with stdenv.lib;
let
qtCompatVersion = "5.11";
qtCompatVersion = srcs.qtbase.version;
stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
pkgs/development/libraries/qt-5/5.12/default.nix
+3 -4
View File
@@ -9,9 +9,8 @@ top-level attribute to `top-level/all-packages.nix`.
1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`.
2. From the top of the Nixpkgs tree, run
`./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`.
3. Update `qtCompatVersion` below if the minor version number changes.
4. Check that the new packages build correctly.
5. Commit the changes and open a pull request.
3. Check that the new packages build correctly.
4. Commit the changes and open a pull request.
*/
@@ -32,7 +31,7 @@ with stdenv.lib;
let
qtCompatVersion = "5.12";
qtCompatVersion = srcs.qtbase.version;
stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
pkgs/development/libraries/qt-5/5.6/default.nix
+3 -4
View File
@@ -18,9 +18,8 @@ existing packages here and modify it as necessary.
1. Update the URL in `./fetch.sh`.
2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$VERSION/`
from the top of the Nixpkgs tree.
3. Update `qtCompatVersion` below if the minor version number changes.
4. Check that the new packages build correctly.
5. Commit the changes and open a pull request.
3. Check that the new packages build correctly.
4. Commit the changes and open a pull request.
*/
@@ -40,7 +39,7 @@ with stdenv.lib;
let
qtCompatVersion = "5.6";
qtCompatVersion = srcs.qtbase.version;
mirror = "http://download.qt.io";
srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
pkgs/development/libraries/qt-5/5.9/default.nix
+3 -4
View File
@@ -9,9 +9,8 @@ top-level attribute to `top-level/all-packages.nix`.
1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`.
2. From the top of the Nixpkgs tree, run
`./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`.
3. Update `qtCompatVersion` below if the minor version number changes.
4. Check that the new packages build correctly.
5. Commit the changes and open a pull request.
3. Check that the new packages build correctly.
4. Commit the changes and open a pull request.
*/
@@ -31,7 +30,7 @@ with stdenv.lib;
let
qtCompatVersion = "5.9";
qtCompatVersion = srcs.qtbase.version;
mirror = "http://download.qt.io";
srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
pkgs/development/libraries/qt-5/modules/qtbase.nix
+5
View File
@@ -146,6 +146,11 @@ stdenv.mkDerivation {
sed -i mkspecs/common/linux.conf \
-e "/^QMAKE_INCDIR_OPENGL/ s|$|${libGL.dev or libGL}/include|" \
-e "/^QMAKE_LIBDIR_OPENGL/ s|$|${libGL.out}/lib|"
'' +
lib.optionalString (stdenv.hostPlatform.isx86_32 && stdenv.cc.isGNU)
''
sed -i mkspecs/common/gcc-base-unix.conf \
-e "/^QMAKE_LFLAGS_SHLIB/ s/-shared/-shared -static-libgcc/"
''
);