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: ed450174ada5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f1af1cb8529c
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 20, 2019

  1. qtkeychain: fix install_name_dir on Darwin

    @Quiark
    Quiark committed Oct 20, 2019
    Copy the full SHA
    1248497 View commit details

Commits on Nov 7, 2019

  1. Merge pull request #71642 from Quiark/qtkeychain 

    qtkeychain: fix install_name_dir on Darwin
    @matthewbauer
    matthewbauer authored Nov 7, 2019
    Copy the full SHA
    f1af1cb View commit details
Showing with 11 additions and 1 deletion.
  1. +10 −0 pkgs/development/libraries/qtkeychain/0002-Fix-install-name-Darwin.patch
  2. +1 −1 pkgs/development/libraries/qtkeychain/default.nix
10 changes: 10 additions & 0 deletions pkgs/development/libraries/qtkeychain/0002-Fix-install-name-Darwin.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -215,7 +215,6 @@
VERSION ${QTKEYCHAIN_VERSION}
SOVERSION ${QTKEYCHAIN_SOVERSION}
MACOSX_RPATH 1
- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}"
INSTALL_RPATH_USE_LINK_PATH TRUE
)

2 changes: 1 addition & 1 deletion pkgs/development/libraries/qtkeychain/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
sha256 = "0h4wgngn2yl35hapbjs24amkjfbzsvnna4ixfhn87snjnq5lmjbc"; # v0.9.1
};

patches = if withQt5 then null else [ ./0001-Fixes-build-with-Qt4.patch ];
patches = (if withQt5 then [] else [ ./0001-Fixes-build-with-Qt4.patch ]) ++ (if stdenv.isDarwin then [ ./0002-Fix-install-name-Darwin.patch ] else []);

cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ];