Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d880360ddc45
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5066963942b0
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Jul 9, 2017

  1. qt5.qtbase: disable bindnow

    @globin
    globin committed Jul 9, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    vdemeester Vincent Demeester
    GPG key ID: 4B8A6F5F62AFA8D1
    Verified
    Learn about vigilant mode
    Copy the full SHA
    63a54ee View commit details

  2. qt5.qtbase: patch for openssl 1.1

    @globin
    globin committed Jul 9, 2017
    Copy the full SHA
    5066963 View commit details
2 changes: 2 additions & 0 deletions pkgs/development/libraries/qt-5/5.9/qtbase/default.nix
View file
Original file line number Diff line number Diff line change
@@ -81,6 +81,8 @@ stdenv.mkDerivation {
patches =
copyPathsToStore (lib.readPathsFromFile ./. ./series);

hardeningDisable = [ "bindnow" ];

postPatch =
''
substituteInPlace configure --replace /bin/pwd pwd
33 changes: 0 additions & 33 deletions pkgs/development/libraries/qt-5/5.9/qtbase/libressl.patch
View file

This file was deleted.

3,320 changes: 3,320 additions & 0 deletions pkgs/development/libraries/qt-5/5.9/qtbase/openssl-1.1.patch
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkgs/development/libraries/qt-5/5.9/qtbase/series
View file
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@ dlopen-resolv.patch
tzdir.patch
dlopen-libXcursor.patch
library-paths.patch
libressl.patch
dlopen-gl.patch
compose-search-path.patch
cmake-paths.patch
qgtk-env.patch
openssl-1.1.patch