diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-03-10 09:23:05 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-03-10 09:23:05 -0600 |
| commit | 66bc2135f6c374ffba8e351a51a2d836a8da5d62 (patch) | |
| tree | a91f439fadd5ee8babe403a328a3a23b0b13924c /pkgs | |
| parent | 1b73890f5bef0ebc3b3f60d03314bd203e0676fb (diff) | |
qtbase: don't patch non-existent .pc files on Darwin
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.6/qtbase/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.7/qtbase/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.8/qtbase/default.nix | 8 |
3 files changed, 25 insertions, 7 deletions
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix index b0e12ae99e485..7a80d63356a7c 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix @@ -267,10 +267,20 @@ stdenv.mkDerivation { done popd fi + '' - # fixup .pc file (where to find 'moc' etc.) - sed "s|^host_bins=.*|host_bins=$dev/bin|" -i "$dev/lib/pkgconfig/Qt5Core.pc" - '' + lib.optionalString stdenv.isDarwin '' + # fixup .pc file (where to find 'moc' etc.) + + lib.optionalString (!stdenv.isDarwin) '' + sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \ + "s|^host_bins=.*|host_bins=$dev/bin|" + '' + + # Don't move .prl files on darwin because they end up in + # "dev/lib/Foo.framework/Foo.prl" which interferes with subsequent + # use of lndir in the qtbase setup-hook. On Linux, the .prl files + # are in lib, and so do not cause a subsequent recreation of deep + # framework directory trees. + + lib.optionalString stdenv.isDarwin '' fixDarwinDylibNames_rpath() { local flags=() diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix index 7f0c71f64b258..8829b33acf61c 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix @@ -228,10 +228,14 @@ stdenv.mkDerivation { done popd fi + '' - # fixup .pc file (where to find 'moc' etc.) - sed "s|^host_bins=.*|host_bins=$dev/bin|" -i "$dev/lib/pkgconfig/Qt5Core.pc" + # fixup .pc file (where to find 'moc' etc.) + + lib.optionalString (!stdenv.isDarwin) '' + sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \ + "s|^host_bins=.*|host_bins=$dev/bin|" '' + # Don't move .prl files on darwin because they end up in # "dev/lib/Foo.framework/Foo.prl" which interferes with subsequent # use of lndir in the qtbase setup-hook. On Linux, the .prl files diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix index cafaaecaa507d..e6d8b5ffeea67 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix @@ -225,10 +225,14 @@ stdenv.mkDerivation { done popd fi + '' - # fixup .pc file (where to find 'moc' etc.) - sed "s|^host_bins=.*|host_bins=$dev/bin|" -i "$dev/lib/pkgconfig/Qt5Core.pc" + # fixup .pc file (where to find 'moc' etc.) + + lib.optionalString (!stdenv.isDarwin) '' + sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \ + "s|^host_bins=.*|host_bins=$dev/bin|" '' + # Don't move .prl files on darwin because they end up in # "dev/lib/Foo.framework/Foo.prl" which interferes with subsequent # use of lndir in the qtbase setup-hook. On Linux, the .prl files |