diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-11 20:52:07 -0600 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-13 19:14:10 -0600 |
commit | bfbfe941abba2a0d7061c86d78b1e8facdeb17f8 (patch) | |
tree | 2f6b86640ce155d6ecf2c5ec79811ad63c2cc703 /pkgs/applications/networking/instant-messengers/swift-im | |
parent | 1ba9fd335d90bca03b3868d3bf10c3d9a9de29c6 (diff) |
treewide: use scons setup hook
Lots of packages can use it. Here is the list: - jackmix - klick - mixx - nova-filters - rhvoice - giv - mypaint - swift-im - bombono - mapnik - serf - nuitka - pyexiv2 - godot - hammer - toluapp - btanks - dxx-rebirth - endless-sky - globulation - the-powder-toy - fceux - gpsd - mongodb - rippled - mariadb - lprof
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/swift-im')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/swift-im/default.nix | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix index 8316c560b0699..51e7f081d1e06 100644 --- a/pkgs/applications/networking/instant-messengers/swift-im/default.nix +++ b/pkgs/applications/networking/instant-messengers/swift-im/default.nix @@ -3,9 +3,7 @@ , lua, miniupnpc, openssl, qtbase, qtmultimedia, qtsvg, qtwebkit, qtx11extras, zlib }: -let - _scons = "scons -j$NIX_BUILD_CORES"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "swift-im-${version}"; version = "4.0.2"; @@ -30,14 +28,12 @@ in stdenv.mkDerivation rec { "-I${miniupnpc}/include/miniupnpc" "-I${qtwebkit.dev}/include/QtWebKit" "-I${qtwebkit.dev}/include/QtWebKitWidgets" + "-fpermissive" ]; - buildPhase = '' - ${_scons} Swift - ''; - - installPhase = '' - ${_scons} SWIFT_INSTALLDIR=$out $out + preInstall = '' + installTargets="$out" + installFlags+=" SWIFT_INSTALLDIR=$out" ''; meta = with stdenv.lib; { |