diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-03-11 16:25:48 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-03-11 16:25:48 -0600 |
| commit | e24261ed16e5ffbbb5737947180b3830ae368476 (patch) | |
| tree | 36d887625e232df798a2b74bbedcb0f5031c8cc5 | |
| parent | bf6c90ed677b41e7ecc512c562a25b0396371f0f (diff) | |
qtbase: fix sed syntax in .pc file fixup
4 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix index 87fb3f08e2b99..c4e7689efa296 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix @@ -269,9 +269,12 @@ 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" \ + -e "/^host_bins=/ c host_bins=$dev/bin" ''; inherit lndir; 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 7a80d63356a7c..60a3896abafba 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix @@ -272,7 +272,7 @@ stdenv.mkDerivation { # 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|" + -e "/^host_bins=/ c host_bins=$dev/bin" '' # Don't move .prl files on darwin because they end up in 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 8829b33acf61c..73df6726f4a7c 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix @@ -233,7 +233,7 @@ stdenv.mkDerivation { # 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|" + -e "/^host_bins=/ c host_bins=$dev/bin" '' # Don't move .prl files on darwin because they end up in 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 e6d8b5ffeea67..a48c5dbb07a97 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix @@ -230,7 +230,7 @@ stdenv.mkDerivation { # 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|" + -e "/^host_bins=/ c host_bins=$dev/bin" '' # Don't move .prl files on darwin because they end up in |