summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2018-11-11 20:52:07 -0600
committerMatthew Bauer <mjbauer95@gmail.com>2018-11-13 19:14:10 -0600
commitbfbfe941abba2a0d7061c86d78b1e8facdeb17f8 (patch)
tree2f6b86640ce155d6ecf2c5ec79811ad63c2cc703 /pkgs/applications
parent1ba9fd335d90bca03b3868d3bf10c3d9a9de29c6 (diff)
downloadnixpkgs-bfbfe941abba2a0d7061c86d78b1e8facdeb17f8.tar
nixpkgs-bfbfe941abba2a0d7061c86d78b1e8facdeb17f8.tar.gz
nixpkgs-bfbfe941abba2a0d7061c86d78b1e8facdeb17f8.tar.bz2
nixpkgs-bfbfe941abba2a0d7061c86d78b1e8facdeb17f8.tar.lz
nixpkgs-bfbfe941abba2a0d7061c86d78b1e8facdeb17f8.tar.xz
nixpkgs-bfbfe941abba2a0d7061c86d78b1e8facdeb17f8.tar.zst
nixpkgs-bfbfe941abba2a0d7061c86d78b1e8facdeb17f8.zip
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')
-rw-r--r--pkgs/applications/audio/jackmix/default.nix6
-rw-r--r--pkgs/applications/audio/klick/default.nix9
-rw-r--r--pkgs/applications/audio/mixxx/default.nix17
-rw-r--r--pkgs/applications/audio/nova-filters/default.nix8
-rw-r--r--pkgs/applications/audio/rhvoice/default.nix12
-rw-r--r--pkgs/applications/graphics/giv/default.nix8
-rw-r--r--pkgs/applications/graphics/mypaint/default.nix5
-rw-r--r--pkgs/applications/networking/instant-messengers/swift-im/default.nix14
-rw-r--r--pkgs/applications/video/bombono/default.nix8
9 files changed, 14 insertions, 73 deletions
diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix
index aa78527d787..83644dd5ea5 100644
--- a/pkgs/applications/audio/jackmix/default.nix
+++ b/pkgs/applications/audio/jackmix/default.nix
@@ -17,12 +17,8 @@ stdenv.mkDerivation rec {
     jack
   ];
 
-  buildPhase = ''
-    scons
-  '';
   installPhase = ''
-    mkdir -p $out/bin
-    cp jackmix/jackmix $out/bin
+    install -D jackmix/jackmix $out/bin/jackmix
   '';
 
   meta = {
diff --git a/pkgs/applications/audio/klick/default.nix b/pkgs/applications/audio/klick/default.nix
index 3a0da876acf..4d1ae8ebd58 100644
--- a/pkgs/applications/audio/klick/default.nix
+++ b/pkgs/applications/audio/klick/default.nix
@@ -12,15 +12,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ scons libsamplerate libsndfile liblo libjack2 boost ];
+  prefixKey = "PREFIX=";
   NIX_CFLAGS_COMPILE = "-fpermissive";
 
-  buildPhase = ''
-    mkdir -p $out
-    scons PREFIX=$out
-  '';
-
-  installPhase = "scons install";
-
   meta = {
     homepage = http://das.nasophon.de/klick/;
     description = "Advanced command-line metronome for JACK";
@@ -28,4 +22,3 @@ stdenv.mkDerivation rec {
     platforms = stdenv.lib.platforms.linux;
   };
 }
-
diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index a99683ef994..4c84fb3c3f7 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -32,26 +32,11 @@ stdenv.mkDerivation rec {
     "opus=1"
   ];
 
-  buildPhase = ''
-    runHook preBuild
-    mkdir -p "$out"
-    scons \
-      -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \
-      $sconsFlags "prefix=$out"
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-    scons $sconsFlags "prefix=$out" install
-    runHook postInstall
-  '';
-
   fixupPhase = ''
     wrapProgram $out/bin/mixxx \
       --set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive;
   '';
-    
+
   meta = with stdenv.lib; {
     homepage = https://mixxx.org;
     description = "Digital DJ mixing software";
diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix
index e65604e974a..1e52ff2d9e4 100644
--- a/pkgs/applications/audio/nova-filters/default.nix
+++ b/pkgs/applications/audio/nova-filters/default.nix
@@ -21,14 +21,6 @@ stdenv.mkDerivation rec {
     sed -i "s/= check/= detail::filter_base<internal_type, checked>::check/" nova/source/dsp/filter.hpp
   '';
 
-  buildPhase = ''
-    scons
-  '';
-
-  installPhase = ''
-    scons $sconsFlags "prefix=$out" install
-  '';
-
   meta = with stdenv.lib; {
     description = "LADSPA plugins based on filters of nova";
     homepage = http://klingt.org/~tim/nova-filters/;
diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/applications/audio/rhvoice/default.nix
index 65cb7dab34a..6516532df33 100644
--- a/pkgs/applications/audio/rhvoice/default.nix
+++ b/pkgs/applications/audio/rhvoice/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, pkgconfig, fetchFromGitHub, scons, python, glibmm, libpulseaudio, libao
-}:
+{ stdenv, lib, pkgconfig, fetchFromGitHub, scons
+, python, glibmm, libpulseaudio, libao }:
 
 let
   version = "unstable-2018-02-10";
@@ -30,14 +30,6 @@ in stdenv.mkDerivation rec {
 
   patches = [ ./honor_nix_environment.patch ];
 
-  buildPhase = ''
-    scons prefix=$out
-  '';
-
-  installPhase = ''
-    scons install
-  '';
-
   meta = {
     description = "A free and open source speech synthesizer for Russian language and others";
     homepage = https://github.com/Olga-Yakovleva/RHVoice/wiki;
diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix
index fbc84521de0..c5eb126cfbf 100644
--- a/pkgs/applications/graphics/giv/default.nix
+++ b/pkgs/applications/graphics/giv/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk2, glib,
-  pcre, cfitsio, perl, gob2, vala, libtiff, json-glib }:
+{ stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk2, glib
+, pcre, cfitsio, perl, gob2, vala, libtiff, json-glib }:
 
 stdenv.mkDerivation rec {
   name = "giv-${version}";
@@ -21,10 +21,6 @@ stdenv.mkDerivation rec {
 
   patches = [ ./build.patch ];
 
-  buildPhase = "scons";
-
-  installPhase = "scons install";
-
   nativeBuildInputs = [ scons pkgconfig vala perl gob2 ];
   buildInputs = [ gdk_pixbuf gtk2 glib pcre cfitsio libtiff json-glib ];
 
diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix
index 120fc1174cd..a22f9c7ac1f 100644
--- a/pkgs/applications/graphics/mypaint/default.nix
+++ b/pkgs/applications/graphics/mypaint/default.nix
@@ -26,10 +26,7 @@ in stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ numpy ];
 
-  buildPhase = "scons prefix=$out";
-
-  installPhase = ''
-    scons prefix=$out install
+  postInstall = ''
     sed -i -e 's|/usr/bin/env python2.7|${python}/bin/python|' $out/bin/mypaint
   '';
 
diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix
index 8316c560b06..51e7f081d1e 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; {
diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix
index e3ba331e437..ad095ddbea5 100644
--- a/pkgs/applications/video/bombono/default.nix
+++ b/pkgs/applications/video/bombono/default.nix
@@ -35,16 +35,10 @@ stdenv.mkDerivation rec {
     libxmlxx ffmpeg enca
     ];
 
-  buildPhase = ''
-    scons PREFIX=$out -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES
-    '';
+  prefixKey = "PREFIX=";
 
   enableParallelBuilding = true;
 
-  installPhase = ''
-    scons install
-    '';
-
   meta = {
     description = "a DVD authoring program for personal computers";
     homepage = "http://www.bombono.org/";