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: 1b5da764a742
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d72ebead34b6
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 27, 2021

  1. Revert "Merge pull request #109239 from poelzi/qt-debug-symbols"

    This reverts commit 8f69090, reversing
    changes made to e6a8527.
    
    In 13e3ec0 this was already addressed
    Mic92 committed Jan 27, 2021
    Copy the full SHA
    d72ebea View commit details
Showing with 0 additions and 4 deletions.
  1. +0 −4 pkgs/development/libraries/qt-5/modules/qtbase.nix
4 changes: 0 additions & 4 deletions pkgs/development/libraries/qt-5/modules/qtbase.nix
Original file line number Diff line number Diff line change
@@ -165,9 +165,6 @@ stdenv.mkDerivation {
qtQmlPrefix = "lib/qt-${qtCompatVersion}/qml";
qtDocPrefix = "share/doc/qt-${qtCompatVersion}";

# don't strip away debugging symbols when build with developerBuild
dontStrip = developerBuild;

setOutputFlags = false;
preConfigure = ''
export LD_LIBRARY_PATH="$PWD/lib:$PWD/plugins/platforms''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
@@ -260,7 +257,6 @@ stdenv.mkDerivation {
++ lib.optionals developerBuild [
"-developer-build"
"-no-warnings-are-errors"
"-force-debug-info"
]
++ (
if (!stdenv.hostPlatform.isx86_64) then [