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

Commits on Nov 6, 2018

  1. qt5.qtbase: add cf-private on darwin 

        Undefined symbols for architecture x86_64:
      "_OBJC_CLASS_$_NSDate", referenced from:
          objc-class-ref in qcore_foundation.o
      "_OBJC_CLASS_$_NSURL", referenced from:
          objc-class-ref in qcore_foundation.o
      "_OBJC_CLASS_$_NSData", referenced from:
          objc-class-ref in qcore_foundation.o
      "_CFURLCopyResourcePropertyForKey", referenced from:
          hasResourcePropertyFlag(QFileSystemMetaData const&, QFileSystemEntry const&, __CFString const*) in qfilesystemengine_unix.o
      "_CFURLCreateBookmarkDataFromFile", referenced from:
          QFileSystemEngine::getLinkTarget(QFileSystemEntry const&, QFileSystemMetaData&) in qfilesystemengine_unix.o
      "_kCFURLIsAliasFileKey", referenced from:
          QFileSystemEngine::fillMetaData(QFileSystemEntry const&, QFileSystemMetaData&, QFlags<QFileSystemMetaData::MetaDataFlag>) in qfilesystemengine_unix.o
      "_kCFURLIsHiddenKey", referenced from:
          QFileSystemEngine::fillMetaData(QFileSystemEntry const&, QFileSystemMetaData&, QFlags<QFileSystemMetaData::MetaDataFlag>) in qfilesystemengine_unix.o
      "_kCFURLIsPackageKey", referenced from:
          QFileSystemEngine::fillMetaData(QFileSystemEntry const&, QFileSystemMetaData&, QFlags<QFileSystemMetaData::MetaDataFlag>) in qfilesystemengine_unix.o
      "_CFURLCreateByResolvingBookmarkData", referenced from:
          QFileSystemEngine::getLinkTarget(QFileSystemEntry const&, QFileSystemMetaData&) in qfilesystemengine_unix.o
    ld: symbol(s) not found for architecture x86_64
    @LnL7
    LnL7 committed Nov 6, 2018
    Copy the full SHA
    9a1a872 View commit details

Commits on Nov 7, 2018

  1. Merge pull request #49845 from LnL7/darwin-qtbase 

    qt5.qtbase: add cf-private on darwin
    @LnL7
    LnL7 authored Nov 7, 2018
    Copy the full SHA
    26cce54 View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 pkgs/development/libraries/qt-5/modules/qtbase.nix
4 changes: 4 additions & 0 deletions pkgs/development/libraries/qt-5/modules/qtbase.nix
View file
Original file line number Diff line number Diff line change
@@ -53,6 +53,7 @@ stdenv.mkDerivation {
if stdenv.isDarwin
then with darwin.apple_sdk.frameworks;
[
# TODO: move to buildInputs, this should not be propagated.
AGL AppKit ApplicationServices Carbon Cocoa CoreAudio CoreBluetooth
CoreLocation CoreServices DiskArbitration Foundation OpenGL
darwin.libobjc libiconv
@@ -77,6 +78,9 @@ stdenv.mkDerivation {
[ libinput ]
++ lib.optional withGtk3 gtk3
)
++ lib.optional stdenv.isDarwin
# Needed for OBJC_CLASS_$_NSDate symbols.
[ darwin.cf-private ]
++ lib.optional developerBuild gdb
++ lib.optional (cups != null) cups
++ lib.optional (mysql != null) mysql.connector-c