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/development | |
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/development')
-rw-r--r-- | pkgs/development/libraries/mapnik/default.nix | 61 | ||||
-rw-r--r-- | pkgs/development/libraries/serf/default.nix | 28 | ||||
-rw-r--r-- | pkgs/development/libraries/swiften/default.nix | 22 | ||||
-rw-r--r-- | pkgs/development/python-modules/nuitka/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/python-modules/pyexiv2/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/tools/godot/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/tools/parsing/hammer/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/toluapp/default.nix | 7 |
8 files changed, 62 insertions, 79 deletions
diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 693260af1c764..5a6a44285ed6a 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -29,40 +29,35 @@ stdenv.mkDerivation rec { postgresql ]; - configurePhase = '' - scons configure PREFIX="$out" BOOST_INCLUDES="${boost.dev}/include" \ - BOOST_LIBS="${boost.out}/lib" \ - CAIRO_INCLUDES="${cairo.dev}/include" \ - CAIRO_LIBS="${cairo.out}/lib" \ - FREETYPE_INCLUDES="${freetype.dev}/include" \ - FREETYPE_LIBS="${freetype.out}/lib" \ - GDAL_CONFIG="${gdal}/bin/gdal-config" \ - HB_INCLUDES="${harfbuzz.dev}/include" \ - HB_LIBS="${harfbuzz.out}/lib" \ - ICU_INCLUDES="${icu.dev}/include" \ - ICU_LIBS="${icu.out}/lib" \ - JPEG_INCLUDES="${libjpeg.dev}/include" \ - JPEG_LIBS="${libjpeg.out}/lib" \ - PNG_INCLUDES="${libpng.dev}/include" \ - PNG_LIBS="${libpng.out}/lib" \ - PROJ_INCLUDES="${proj}/include" \ - PROJ_LIBS="${proj}/lib" \ - SQLITE_INCLUDES="${sqlite.dev}/include" \ - SQLITE_LIBS="${sqlite.out}/lib" \ - TIFF_INCLUDES="${libtiff.dev}/include" \ - TIFF_LIBS="${libtiff.out}/lib" \ - WEBP_INCLUDES="${libwebp}/include" \ - WEBP_LIBS="${libwebp}/lib" \ - XML2_INCLUDES="${libxml2.dev}/include" \ - XML2_LIBS="${libxml2.out}/lib" - ''; + prefixKey = "PREFIX="; - buildPhase = false; - - installPhase = '' - mkdir -p "$out" - scons install - ''; + sconsFlags = [ + "BOOST_INCLUDES=${boost.dev}/include" + "BOOST_LIBS=${boost.out}/lib" + "CAIRO_INCLUDES=${cairo.dev}/include" + "CAIRO_LIBS=${cairo.out}/lib" + "FREETYPE_INCLUDES=${freetype.dev}/include" + "FREETYPE_LIBS=${freetype.out}/lib" + "GDAL_CONFIG=${gdal}/bin/gdal-config" + "HB_INCLUDES=${harfbuzz.dev}/include" + "HB_LIBS=${harfbuzz.out}/lib" + "ICU_INCLUDES=${icu.dev}/include" + "ICU_LIBS=${icu.out}/lib" + "JPEG_INCLUDES=${libjpeg.dev}/include" + "JPEG_LIBS=${libjpeg.out}/lib" + "PNG_INCLUDES=${libpng.dev}/include" + "PNG_LIBS=${libpng.out}/lib" + "PROJ_INCLUDES=${proj}/include" + "PROJ_LIBS=${proj}/lib" + "SQLITE_INCLUDES=${sqlite.dev}/include" + "SQLITE_LIBS=${sqlite.out}/lib" + "TIFF_INCLUDES=${libtiff.dev}/include" + "TIFF_LIBS=${libtiff.out}/lib" + "WEBP_INCLUDES=${libwebp}/include" + "WEBP_LIBS=${libwebp}/lib" + "XML2_INCLUDES=${libxml2.dev}/include" + "XML2_LIBS=${libxml2.out}/lib" + ]; meta = with stdenv.lib; { description = "An open source toolkit for developing mapping applications"; diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index f794c3841b932..3fd47125bcb30 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -9,28 +9,22 @@ stdenv.mkDerivation rec { sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ apr scons openssl aprutil zlib libiconv ] + nativeBuildInputs = [ pkgconfig scons ]; + buildInputs = [ apr openssl aprutil zlib libiconv ] ++ stdenv.lib.optional (!stdenv.isCygwin) kerberos; patches = [ ./scons.patch ]; - buildPhase = '' - scons \ - -j $NIX_BUILD_CORES \ - APR="$(echo ${apr.dev}/bin/*-config)" \ - APU="$(echo ${aprutil.dev}/bin/*-config)" \ - CC=$CC \ - OPENSSL=${openssl} \ - PREFIX="$out" \ - ZLIB=${zlib} \ - ${ - if stdenv.isCygwin then "" else "GSSAPI=${kerberos.dev}" - } - ''; + prefixKey = "PREFIX="; - installPhase = '' - scons install + preConfigure = '' + sconsFlags+=" APR=$(echo ${apr.dev}/bin/*-config)" + sconsFlags+=" APU=$(echo ${aprutil.dev}/bin/*-config)" + sconsFlags+=" CC=$CC" + sconsFlags+=" OPENSSL=${openssl}" + sconsFlags+=" ZLIB=${zlib}" + '' + stdenv.lib.optionalString (!stdenv.isCygwin) '' + sconsFlags+=" GSSAPI=${kerberos.dev}" ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix index 1759258e6664f..c83f5b0f5ac38 100644 --- a/pkgs/development/libraries/swiften/default.nix +++ b/pkgs/development/libraries/swiften/default.nix @@ -1,8 +1,9 @@ -{ stdenv, python, fetchurl, openssl, boost }: +{ stdenv, python, fetchurl, openssl, boost, scons }: stdenv.mkDerivation rec { name = "swiften-${version}"; version = "4.0.2"; + nativeBuildInputs = [ scons]; buildInputs = [ python ]; propagatedBuildInputs = [ openssl boost ]; @@ -10,16 +11,17 @@ stdenv.mkDerivation rec { url = "https://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz"; sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w"; }; - - buildPhase = '' - patchShebangs ./scons - ./scons openssl=${openssl.dev} \ - boost_includedir=${boost.dev}/include \ - boost_libdir=${boost.out}/lib \ - boost_bundled_enable=false \ - SWIFTEN_INSTALLDIR=$out $out + + sconsFlags = [ + "openssl=${openssl.dev}" + "boost_includedir=${boost.dev}/include" + "boost_libdir=${boost.out}/lib" + "boost_bundled_enable=false" + ]; + preInstall = '' + installTargets="$out" + installFlags+=" SWIFT_INSTALLDIR=$out" ''; - installPhase = "true"; meta = with stdenv.lib; { description = "An XMPP library for C++, used by the Swift client"; diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index 67e2782b53a48..5b840d1993c95 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -22,9 +22,8 @@ in buildPythonPackage rec { sha256 = "01vm8mqhpdrwlxw6rxbg3wz51njq69yn862141mja00mllg3j7pg"; }; - buildInputs = stdenv.lib.optionals doCheck [ vmprof pyqt4 ]; - - propagatedBuildInputs = [ scons ]; + checkInputs = [ vmprof pyqt4 ]; + nativeBuildInputs = [ scons ]; postPatch = '' patchShebangs tests/run-tests diff --git a/pkgs/development/python-modules/pyexiv2/default.nix b/pkgs/development/python-modules/pyexiv2/default.nix index 3384e981ff07a..5b98a61735e21 100644 --- a/pkgs/development/python-modules/pyexiv2/default.nix +++ b/pkgs/development/python-modules/pyexiv2/default.nix @@ -10,13 +10,12 @@ buildPythonPackage rec { sha256 = "09r1ga6kj5cnmrldpkqzvdhh7xi7aad9g4fbcr1gawgsd9y13g0a"; }; - buildPhase = '' + preBuild = '' sed -i -e "s@env = Environment()@env = Environment( ENV = os.environ )@" src/SConscript - scons ''; - installPhase = '' + + preInstall = '' sed -i -e "s@ python_lib_path = get_python_lib(plat_specific=True)@ python_lib_path = \'/lib/python2.7/site-packages\'@" src/SConscript - scons install DESTDIR=$out ''; buildInputs = [ python exiv2 scons boost ]; diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index e22b8b25eaa4d..dd6a413cebf26 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -33,10 +33,9 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - buildPhase = '' - scons target=release_debug platform=x11 prefix=$out -j $NIX_BUILD_CORES \ - ${lib.concatStringsSep " " - (lib.mapAttrsToList (k: v: "${k}=${builtins.toJSON v}") options)} + sconsFlags = "target=release_debug platform=x11"; + preConfigure = '' + sconsFlags+=" ${lib.concatStringsSep " " (lib.mapAttrsToList (k: v: "${k}=${builtins.toJSON v}") options)}" ''; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix index 86c1f82678aee..bf5a2374fdefa 100644 --- a/pkgs/development/tools/parsing/hammer/default.nix +++ b/pkgs/development/tools/parsing/hammer/default.nix @@ -12,8 +12,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib python scons ]; - buildPhase = "scons prefix=$out"; - installPhase = "scons prefix=$out install"; meta = with stdenv.lib; { description = "A bit-oriented parser combinator library"; @@ -28,5 +26,5 @@ stdenv.mkDerivation rec { homepage = https://github.com/UpstandingHackers/hammer; license = licenses.gpl2; platforms = platforms.linux; - }; + }; } diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix index 64a2f4346c794..1214058698e2d 100644 --- a/pkgs/development/tools/toluapp/default.nix +++ b/pkgs/development/tools/toluapp/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0zd55bc8smmgk9j4cf0jpibb03lgsvl0knpwhplxbv93mcdnw7s0"; }; - buildInputs = [ lua scons ]; + nativeBuildInputs = [ scons ]; + buildInputs = [ lua ]; patches = [ ./environ-and-linux-is-kinda-posix.patch ]; @@ -20,10 +21,6 @@ stdenv.mkDerivation rec { --replace /usr/local $out ''; - buildPhase = ''scons''; - - installPhase = ''scons install''; - meta = with stdenv.lib; { description = "A tool to integrate C/Cpp code with Lua"; homepage = http://www.codenix.com/~tolua/; |