From ac8e5edada14629bac7abd7a19b987fa13ec8950 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 29 Dec 2015 22:47:41 +0100
Subject: [PATCH 01/12] box2d: use stdenv

This replaces use of `builderDefsPackage`. Also change to download
tarball from GitHub as it is the new upstream home.
---
 pkgs/development/libraries/box2d/default.nix | 66 +++++++-------------
 1 file changed, 24 insertions(+), 42 deletions(-)

diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix
index 10a7ca54952..25d291da332 100644
--- a/pkgs/development/libraries/box2d/default.nix
+++ b/pkgs/development/libraries/box2d/default.nix
@@ -1,51 +1,33 @@
-x@{builderDefsPackage
-  , unzip, cmake, mesa, freeglut, libX11, xproto
-  , inputproto, libXi, fetchsvn, pkgconfig
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchsvn" "builderDefsPackage"] ++
-    [];
+{ stdenv, fetchurl, unzip, cmake, mesa, freeglut, libX11, xproto, inputproto
+, libXi, pkgconfig }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-in
-rec {
-  version = "2.3.0";
+stdenv.mkDerivation rec {
   name = "box2d-${version}";
-  srcDrv = a.fetchsvn {
-    url = "http://box2d.googlecode.com/svn/trunk";
-    rev = "277";
-    sha256 = "1xp93yw2zcqhmh999v7cwqaqxq1glgyg5r8kfm4yabc1ypba3in4";
+  version = "2.3.0";
+
+  src = fetchurl {
+    url = "https://github.com/erincatto/Box2D/archive/v${version}.tar.gz";
+    sha256 = "1dmbswh4x2n5l3c9h0k72m0z4rdpzfy1xl8m8p3rf5rwkvk3bkg2";
   };
-  src = srcDrv + "/";
 
-  inherit buildInputs;
+  sourceRoot = "Box2D-${version}/Box2D";
 
-  phaseNames = ["changeSettings" "doCmake" "doMakeInstall"];
+  buildInputs = [
+    unzip cmake mesa freeglut libX11 xproto inputproto libXi pkgconfig
+  ];
 
-  changeSettings = a.fullDepEntry ''
-    sed -i Box2D/Common/b2Settings.h -e 's@b2_maxPolygonVertices .*@b2_maxPolygonVertices 15@'
-  '' ["minInit" "addInputs" "doUnpack"];
-      
-  goSrcDir = ''cd Box2D'';
+  cmakeFlags = [ "-DBOX2D_INSTALL=ON" "-DBOX2D_BUILD_SHARED=ON" ];
 
-  doCmake = a.fullDepEntry ''
-    cd Build; 
-    cmake -DBOX2D_INSTALL=ON -DBOX2D_BUILD_SHARED=ON -DCMAKE_INSTALL_PREFIX=$out ..
-  '' ["minInit" "addInputs" "doUnpack"];
-      
-  meta = {
+  prePatch = ''
+    substituteInPlace Box2D/Common/b2Settings.h \
+      --replace 'b2_maxPolygonVertices	8' 'b2_maxPolygonVertices	15'
+  '';
+
+  meta = with stdenv.lib; {
     description = "2D physics engine";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = "bsd";
-    inherit version;
+    homepage = http://box2d.org/;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
+    license = licenses.zlib;
   };
-}) x
-
+}

From bbd253b569bf0ada40e4b177c22568086a82165f Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 29 Dec 2015 23:33:13 +0100
Subject: [PATCH 02/12] allegro: use stdenv

This replaces use of `builderDefsPackage`. Also change to download
tarball from GNA as it is the new upstream home. Minor other fixes.
---
 .../development/libraries/allegro/default.nix | 75 ++++++-------------
 1 file changed, 23 insertions(+), 52 deletions(-)

diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix
index 6d31087968c..deb3a6877e8 100644
--- a/pkgs/development/libraries/allegro/default.nix
+++ b/pkgs/development/libraries/allegro/default.nix
@@ -1,59 +1,30 @@
-x@{builderDefsPackage
-  , texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor
-  , alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc
-  , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal, mesa
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
+{ stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto
+, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
+, libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto
+, xf86vidmodeproto, libXxf86vm, openal, mesa }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="allegro";
-    version="4.4.2";
-    name="${baseName}-${version}";
-    project="alleg";
-    url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz";
-    hash="1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "allegro-${version}";
+  version="4.4.2";
+
+  src = fetchurl {
+    url = "http://download.gna.org/allegro/allegro/${version}/${name}.tar.gz";
+    sha256 = "1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doCmake" "doMakeInstall"];
-
-  doCmake = a.fullDepEntry (''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lXext -lX11 -lXpm -lXcursor -lXxf86vm"
-    cmake -D CMAKE_INSTALL_PREFIX=$out -D CMAKE_SKIP_RPATH=ON .
-  '') ["minInit" "doUnpack" "addInputs"];
-
-  makeFlags = [
+  buildInputs = [
+    texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor
+    alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc
+    xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal mesa
   ];
 
-  meta = {
-    branch = "4";
+  cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ];
+
+  meta = with stdenv.lib; {
     description = "A game programming library";
-    license = a.lib.licenses.free; # giftware
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
+    homepage = http://liballeg.org/;
+    license = licenses.free; # giftware
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://sourceforge.net/projects/alleg/files/";
-    };
-  };
-}) x
+}

From f37279aebc9a0fa6a60727cb410a9d2d7655a4ab Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 29 Dec 2015 23:34:19 +0100
Subject: [PATCH 03/12] allegro5: use stdenv

This replaces use of `builderDefsPackage`. Also change to download
tarball from GNA as it is the new upstream home. Minor other fixes.
---
 pkgs/development/libraries/allegro/5.nix      | 69 ++++++-------------
 pkgs/development/libraries/allegro/5.upstream |  7 --
 2 files changed, 22 insertions(+), 54 deletions(-)
 delete mode 100644 pkgs/development/libraries/allegro/5.upstream

diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index 793b57c676b..6f05afa4f48 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -1,56 +1,31 @@
+{ stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto
+, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
+, libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto
+, xf86vidmodeproto, libXxf86vm, openal, mesa, kbproto, libjpeg, flac }:
 
-x@{builderDefsPackage
-  , texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor
-  , alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc
-  , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal, mesa
-  , kbproto, libjpeg, flac
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
+stdenv.mkDerivation rec {
+  name = "allegro-${version}";
+  version = "5.0.11";
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="allegro";
-    version = "5.0.11";
-    name="${baseName}-${version}";
-    project="alleg";
-    url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz";
-    hash="18fdppaqaf3g3rcqwhyvsmkzk3y14clz4l8cvmg4hvjgyf011f3i";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
+  src = fetchurl {
+    url = "http://download.gna.org/allegro/allegro/${version}/${name}.tar.gz";
     sha256 = "0cd51qrh97jrr0xdmnivqgwljpmizg8pixsgvc4blqqlaz4i9zj9";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doCmake" "doMakeInstall"];
-
-  doCmake = a.fullDepEntry (''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lXext -lX11 -lXpm -lXcursor -lXxf86vm"
-    cmake -D CMAKE_INSTALL_PREFIX=$out -D CMAKE_SKIP_RPATH=ON .
-  '') ["minInit" "doUnpack" "addInputs"];
-
-  makeFlags = [
+  buildInputs = [
+    texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor
+    alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc
+    xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal mesa
+    kbproto libjpeg flac
   ];
 
-  meta = {
+  cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ];
+
+  meta = with stdenv.lib; {
     description = "A game programming library";
-    license = a.lib.licenses.free; # giftware
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    inherit version;
+    homepage = http://liballeg.org/;
+    license = licenses.zlib;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
   };
-}) x
+}
diff --git a/pkgs/development/libraries/allegro/5.upstream b/pkgs/development/libraries/allegro/5.upstream
deleted file mode 100644
index 9d139383fe3..00000000000
--- a/pkgs/development/libraries/allegro/5.upstream
+++ /dev/null
@@ -1,7 +0,0 @@
-attribute_name allegro5
-url http://alleg.sourceforge.net/download.html
-version_link '[.]tar[.].*/download$'
-SF_redirect
-do_overwrite () {
-  do_overwrite_just_version
-}

From 9a47354a964fd0b746dd753f0dd1ebf24ff9ce69 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 29 Dec 2015 23:34:36 +0100
Subject: [PATCH 04/12] allegro5unstable: use stdenv

This replaces use of `builderDefsPackage`. Also change to download
tarball from GNA as it is the new upstream home. Minor other fixes.
---
 .../libraries/allegro/5-unstable.nix          | 79 +++++++------------
 .../libraries/allegro/5-unstable.upstream     |  7 --
 2 files changed, 27 insertions(+), 59 deletions(-)
 delete mode 100644 pkgs/development/libraries/allegro/5-unstable.upstream

diff --git a/pkgs/development/libraries/allegro/5-unstable.nix b/pkgs/development/libraries/allegro/5-unstable.nix
index dd0df768a68..e5a2c38ddab 100644
--- a/pkgs/development/libraries/allegro/5-unstable.nix
+++ b/pkgs/development/libraries/allegro/5-unstable.nix
@@ -1,61 +1,36 @@
+{ stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto
+, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
+, libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto
+, xf86vidmodeproto, libXxf86vm, openal, mesa, kbproto, libjpeg, flac
+, inputproto, libXi, fixesproto, libXfixes }:
 
-x@{builderDefsPackage
-  , texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor
-  , alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc
-  , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal, mesa
-  , kbproto, libjpeg, flac, inputproto, libXi, fixesproto, libXfixes
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
+stdenv.mkDerivation rec {
+  name = "allegro-${version}";
+  version = "5.1.11";
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="allegro";
-    folderSuffix = "-unstable";
-    version = "5.1.11";
-    name="${baseName}-${version}";
-    project="alleg";
-    url="mirror://sourceforge/project/${project}/${baseName}${folderSuffix}/${version}/${name}.tar.gz";
-    hash="18fdppaqaf3g3rcqwhyvsmkzk3y14clz4l8cvmg4hvjgyf011f3i";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
+  src = fetchurl {
+    url = "http://download.gna.org/allegro/allegro-unstable/${version}/${name}.tar.gz";
     sha256 = "0zz07gdyc6xflpvkknwgzsyyyh9qiwd69j42rm9cw1ciwcsic1vs";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["patchIncludes" "doCmake" "doMakeInstall"];
-
-  patchIncludes = a.fullDepEntry ''
-    sed -e 's@/XInput2.h@/XI2.h@g' -i CMakeLists.txt src/*.c
-  '' ["minInit" "doUnpack"];
-
-  doCmake = a.fullDepEntry (''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lXext -lX11 -lXpm -lXcursor -lXxf86vm -lXi -lXfixes"
-    cmake -D CMAKE_INSTALL_PREFIX=$out -D CMAKE_SKIP_RPATH=ON .
-  '') ["minInit" "doUnpack" "addInputs"];
-
-  makeFlags = [
+  buildInputs = [
+    texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor
+    alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc
+    xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal mesa
+    kbproto libjpeg flac inputproto libXi fixesproto libXfixes
   ];
 
-  meta = {
+  patchPhase = ''
+    sed -e 's@/XInput2.h@/XI2.h@g' -i CMakeLists.txt "src/"*.c
+  '';
+
+  cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ];
+
+  meta = with stdenv.lib; {
     description = "A game programming library";
-    license = a.lib.licenses.free; # giftware
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    inherit version;
+    homepage = http://liballeg.org/;
+    license = licenses.zlib;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
   };
-}) x
+}
diff --git a/pkgs/development/libraries/allegro/5-unstable.upstream b/pkgs/development/libraries/allegro/5-unstable.upstream
deleted file mode 100644
index e07829c08cc..00000000000
--- a/pkgs/development/libraries/allegro/5-unstable.upstream
+++ /dev/null
@@ -1,7 +0,0 @@
-attribute_name allegro5
-url http://alleg.sourceforge.net/download.html
-version_link '/allegro-unstable/.*[.]tar[.].*/download$'
-SF_redirect
-do_overwrite () {
-  do_overwrite_just_version
-}

From abf836b06652a3545fb8b009aeb0bb6600fe3479 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 29 Dec 2015 23:52:11 +0100
Subject: [PATCH 05/12] ois: use stdenv

This replaces use of `builderDefsPackage`.
---
 pkgs/development/libraries/ois/default.nix | 81 +++++++++-------------
 1 file changed, 31 insertions(+), 50 deletions(-)

diff --git a/pkgs/development/libraries/ois/default.nix b/pkgs/development/libraries/ois/default.nix
index 67df3645eb9..25bb7a365f2 100644
--- a/pkgs/development/libraries/ois/default.nix
+++ b/pkgs/development/libraries/ois/default.nix
@@ -1,60 +1,41 @@
-x@{builderDefsPackage, fetchurl
-  , autoconf, automake, libtool, m4
-  , libX11, xproto, libXi, inputproto
-  , libXaw, libXmu, libXt
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, autoconf, automake, libtool, libX11, xproto
+, libXi, inputproto, libXaw, libXmu, libXt }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="ois";
-    majorVersion="1";
-    minorVersion="3";
-    version="${majorVersion}.${minorVersion}";
-    name="${baseName}-${version}";
-    url="mirror://sourceforge/project/wgois/Source%20Release/${version}/ois_v${majorVersion}-${minorVersion}.tar.gz";
-    hash="18gs6xxhbqb91x2gm95hh1pmakimqim1k9c65h7ah6g14zc7dyjh";
-  };
+let
+  majorVersion = "1";
+  minorVersion = "3";
 in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+
+stdenv.mkDerivation rec {
+  name = "ois-${version}";
+  version = "${majorVersion}.${minorVersion}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/wgois/Source%20Release/${version}/ois_v${majorVersion}-${minorVersion}.tar.gz";
+    sha256 = "18gs6xxhbqb91x2gm95hh1pmakimqim1k9c65h7ah6g14zc7dyjh";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  patches = [
+    (fetchurl {
+      url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-games/ois/files/ois-1.3-gcc47.patch;
+      sha256 = "026jw06n42bcrmg0sbdhzc4cqxsnf7fw30a2z9cigd9x282zhii8";
+      name = "gcc47.patch";
+    })
+  ];
 
-  phaseNames = ["doPatch" "doConfigure" "doMakeInstall"];
-
-  patches = [(fetchurl {
-    url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-games/ois/files/ois-1.3-gcc47.patch;
-    sha256 = "026jw06n42bcrmg0sbdhzc4cqxsnf7fw30a2z9cigd9x282zhii8";
-    name = "gcc47.patch";
-  })];
   patchFlags = "-p0";
 
-  configureCommand = ''sh bootstrap; sh configure'';
+  buildInputs = [
+    autoconf automake libtool libX11 xproto libXi inputproto libXaw
+    libXmu libXt
+  ];
 
-  meta = {
+  preConfigure = "sh bootstrap";
+
+  meta = with stdenv.lib; {
     description = "Object-oriented C++ input system";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.zlib;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
+    license = licenses.zlib;
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://sourceforge.net/projects/wgois/files/Source Release/";
-    };
-  };
-}) x
-
+}

From 7ce3f6f976d4362009f41c69ba634c08a2775db1 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 30 Dec 2015 00:06:34 +0100
Subject: [PATCH 06/12] openscenegraph: use stdenv

This replaces use of `builderDefsPackage`. Also minor cleanups.
---
 .../libraries/openscenegraph/default.nix      | 78 +++++++------------
 1 file changed, 27 insertions(+), 51 deletions(-)

diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix
index ecb4d82c965..578d0219c02 100644
--- a/pkgs/development/libraries/openscenegraph/default.nix
+++ b/pkgs/development/libraries/openscenegraph/default.nix
@@ -1,60 +1,36 @@
-x@{builderDefsPackage
-  , cmake, giflib, libjpeg, libtiff, lib3ds, freetype, libpng
-  , coin3d, jasper, gdal_1_11, xproto, libX11, libXmu, freeglut, mesa
-  , doxygen, ffmpeg, xineLib, unzip, zlib, openal, libxml2
-  , curl, a52dec, faad2, gdk_pixbuf, pkgconfig, kbproto, SDL
-  , qt4, poppler, librsvg, gtk
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
+{ stdenv, fetchurl, cmake, giflib, libjpeg, libtiff, lib3ds, freetype
+, libpng, coin3d, jasper, gdal_1_11, xproto, libX11, libXmu
+, freeglut, mesa, doxygen, ffmpeg, xineLib, unzip, zlib, openal
+, libxml2, curl, a52dec, faad2, gdk_pixbuf, pkgconfig, kbproto, SDL
+, qt4, poppler, librsvg, gtk }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="OpenSceneGraph";
-    version="3.2.1";
-    name="${baseName}-${version}";
-    url="http://trac.openscenegraph.org/downloads/developer_releases/${name}.zip";
-    hash="0v9y1gxb16y0mj994jd0mhcz32flhv2r6kc01xdqb4817lk75bnr";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "openscenegraph-${version}";
+  version = "3.2.1";
+
+  src = fetchurl {
+    url = "http://trac.openscenegraph.org/downloads/developer_releases/${name}.zip";
+    sha256 = "0v9y1gxb16y0mj994jd0mhcz32flhv2r6kc01xdqb4817lk75bnr";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["setVars" "addInputs" "doUnpack" "doPatch" "doCmake" "doMakeInstall"];
-
-  cmakeFlags = [
-    "-D MATH_LIBRARY="
+  buildInputs = [
+    cmake giflib libjpeg libtiff lib3ds freetype libpng coin3d jasper
+    gdal_1_11 xproto libX11 libXmu freeglut mesa doxygen ffmpeg
+    xineLib unzip zlib openal libxml2 curl a52dec faad2 gdk_pixbuf
+    pkgconfig kbproto SDL qt4 poppler librsvg gtk
   ];
 
-  setVars = a.noDepEntry ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D__STDC_CONSTANT_MACROS=1"
-  '';
+  cmakeFlags = [
+    "-DMATH_LIBRARY="
+    "-DCMAKE_C_FLAGS=-D__STDC_CONSTANT_MACROS=1"
+    "-DCMAKE_CXX_FLAGS=-D__STDC_CONSTANT_MACROS=1"
+  ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A 3D graphics toolkit";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
+    homepage = http://www.openscenegraph.org/;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
     license = "OpenSceneGraph Public License - free LGPL-based license";
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://www.openscenegraph.org/projects/osg/wiki/Downloads";
-    };
-  };
-}) x
-
+}

From 6ca0480de6a6ad442455157d90605c4c2a4d2c3a Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 30 Dec 2015 11:58:06 +0100
Subject: [PATCH 07/12] cgui: use stdenv

This replaces use of `builderDefsPackage`.
---
 pkgs/development/libraries/cgui/default.nix | 65 ++++++---------------
 1 file changed, 17 insertions(+), 48 deletions(-)

diff --git a/pkgs/development/libraries/cgui/default.nix b/pkgs/development/libraries/cgui/default.nix
index 6bd3dd41de7..0f117862236 100644
--- a/pkgs/development/libraries/cgui/default.nix
+++ b/pkgs/development/libraries/cgui/default.nix
@@ -1,57 +1,26 @@
-x@{builderDefsPackage
-  , texinfo, allegro, perl
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, texinfo, allegro, perl }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="cgui";
-    version="2.0.3";
-    name="${baseName}-${version}";
-    project="${baseName}";
-    url="mirror://sourceforge/project/${project}/${version}/${name}.tar.gz";
-    hash="00kk4xaw68m44awy8zq4g5plx372swwccvzshn68a0a8f3f2wi4x";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "cgui-${version}";
+  version="2.0.3";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/cgui/${version}/${name}.tar.gz";
+    sha256 = "00kk4xaw68m44awy8zq4g5plx372swwccvzshn68a0a8f3f2wi4x";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  buildInputs = [ texinfo allegro perl ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["genMakefile" "doMakeInstall"];
-
-  genMakefile = a.fullDepEntry (''
+  configurePhase = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC"
     sh fix.sh unix
-  '') ["minInit" "doUnpack" "addInputs"];
-      
-  makeFlags = [
-    "SYSTEM_DIR=$out"
-  ];
+  '';
 
-  meta = {
+  makeFlags = [ "SYSTEM_DIR=$(out)" ];
+
+  meta = with stdenv.lib; {
     description = "A multiplatform basic GUI library";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://sourceforge.net/projects/cgui/files/";
-    };
-  };
-}) x
-
+}

From ffd09ecc60d26863a33d2ece4a362bc9e585344e Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 30 Dec 2015 12:22:11 +0100
Subject: [PATCH 08/12] unicap: use stdenv

This replaces use of `builderDefsPackage`. Also fix build.
---
 pkgs/development/libraries/unicap/default.nix | 70 +++++++------------
 1 file changed, 24 insertions(+), 46 deletions(-)

diff --git a/pkgs/development/libraries/unicap/default.nix b/pkgs/development/libraries/unicap/default.nix
index daec5a78566..604a1b7012a 100644
--- a/pkgs/development/libraries/unicap/default.nix
+++ b/pkgs/development/libraries/unicap/default.nix
@@ -1,56 +1,34 @@
-x@{builderDefsPackage
-  , libusb, libraw1394, dcraw, intltool, perl
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, libusb, libraw1394, dcraw, intltool, perl, v4l_utils }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="libunicap";
-    version="0.9.12";
-    name="${baseName}-${version}";
-    url="http://www.unicap-imaging.org/downloads/${name}.tar.gz";
-    hash="05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "libunicap-${version}";
+  version="0.9.12";
+
+  src = fetchurl {
+    url = "http://www.unicap-imaging.org/downloads/${name}.tar.gz";
+    sha256 = "05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  buildInputs = [ libusb libraw1394 dcraw intltool perl v4l_utils ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["fixIncludes" "fixMakefiles" "doConfigure" "doMakeInstall"];
+  patches = [
+    # Debian has a patch that fixes the build.
+    (fetchurl {
+      url = "https://sources.debian.net/data/main/u/unicap/0.9.12-2/debian/patches/1009_v4l1.patch";
+      sha256 = "1lgypmhdj681m7d1nmzgvh19cz8agj2f31wlnfib0ha8i3g5hg5w";
+    })
+  ];
 
-  fixIncludes = a.fullDepEntry (''
+  postPatch = ''
     find . -type f -exec sed -e '/linux\/types\.h/d' -i '{}' ';'
-  '') ["minInit" "doUnpack"];
-
-  fixMakefiles = a.fullDepEntry (''
     sed -e 's@/etc/udev@'"$out"'/&@' -i data/Makefile.*
-  '') ["minInit" "doUnpack"];
+  '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Universal video capture API";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    broken = true;
+    homepage = http://www.unicap-imaging.org/;
+    maintainers = [ maintainers.raskin ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://unicap-imaging.org/download.htm";
-    };
-  };
-}) x
-
+}

From 9f5b058041c954e5e8b2962acf0438bd1d5833bd Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 30 Dec 2015 12:41:40 +0100
Subject: [PATCH 09/12] regina: use stdenv

This replaces use of `builderDefsPackage`.
---
 .../interpreters/regina/default.nix           | 57 ++++++-------------
 1 file changed, 16 insertions(+), 41 deletions(-)

diff --git a/pkgs/development/interpreters/regina/default.nix b/pkgs/development/interpreters/regina/default.nix
index 596b748a4f6..1d67193a73c 100644
--- a/pkgs/development/interpreters/regina/default.nix
+++ b/pkgs/development/interpreters/regina/default.nix
@@ -1,49 +1,24 @@
-x@{builderDefsPackage
-  , ncurses
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, ncurses }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="Regina-REXX";
-    pname="regina-rexx";
-    version = "3.9.1";
-    name="${baseName}-${version}";
-    url="mirror://sourceforge/${pname}/${pname}/${version}/${name}.tar.gz";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
+stdenv.mkDerivation rec {
+  name = "Regina-REXX-${version}";
+  version = "3.9.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/regina-rexx/regina-rexx/${version}/${name}.tar.gz";
     sha256 = "1vpksnjmg6y5zag9li6sxqxj2xapgalfz8krfxgg49vyk0kdy4sx";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
+  buildInputs = [ ncurses ];
 
   configureFlags = [
-    "--libdir=$out/lib"
+    "--libdir=$(out)/lib"
   ];
-      
-  meta = {
-    description = "REXX interpreter";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.lgpl2;
-    downloadPage = "http://sourceforge.net/projects/regina-rexx/files/regina-rexx/";
-    inherit version;
-  };
-}) x
 
+  meta = with stdenv.lib; {
+    description = "REXX interpreter";
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
+    license = licenses.lgpl2;
+  };
+}

From 23675945754e9e394fc317e0483d10c6417a6f11 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 30 Dec 2015 14:04:45 +0100
Subject: [PATCH 10/12] hawknl: fix download URL

The upstream URL is broken, use an alternative download URL. Checksum is
the same as old download.
---
 pkgs/development/libraries/hawknl/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/hawknl/default.nix b/pkgs/development/libraries/hawknl/default.nix
index 290f411cbf4..372a8b8c112 100644
--- a/pkgs/development/libraries/hawknl/default.nix
+++ b/pkgs/development/libraries/hawknl/default.nix
@@ -1,11 +1,12 @@
 {stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation {
-	name = "hawknl-1.34";
-	src = fetchurl {
-		url = http://hawksoft.com/download/files/HawkNL168src.zip;
-		sha256 = "11shn2fbxj3w0j77w0234pqyj1368x686kkgv09q5yqhi1cdp028";
-	};
+  name = "hawknl-1.68";
+
+  src = fetchurl {
+    url = http://urchlay.naptime.net/~urchlay/src/HawkNL168src.zip;
+    sha256 = "11shn2fbxj3w0j77w0234pqyj1368x686kkgv09q5yqhi1cdp028";
+  };
 
   buildInputs = [ unzip ];
 

From 73ede34fe55e81a48b122792d1ae814ab0990427 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 30 Dec 2015 15:41:17 +0100
Subject: [PATCH 11/12] vbetool: use stdenv

This replaces use of `builderDefsPackage`.
---
 pkgs/tools/system/vbetool/default.nix         | 43 ++++++++-----------
 pkgs/tools/system/vbetool/src-for-default.nix |  9 ----
 .../system/vbetool/src-info-for-default.nix   |  4 --
 pkgs/top-level/all-packages.nix               |  2 +-
 4 files changed, 20 insertions(+), 38 deletions(-)
 delete mode 100644 pkgs/tools/system/vbetool/src-for-default.nix
 delete mode 100644 pkgs/tools/system/vbetool/src-info-for-default.nix

diff --git a/pkgs/tools/system/vbetool/default.nix b/pkgs/tools/system/vbetool/default.nix
index 402f93ec8fb..a8c27a42b1d 100644
--- a/pkgs/tools/system/vbetool/default.nix
+++ b/pkgs/tools/system/vbetool/default.nix
@@ -1,31 +1,26 @@
-a @ {pciutils, libx86, zlib, ...} :
-let
-  s = import ./src-for-default.nix;
-  buildInputs = with a; [
-    libx86 pciutils zlib
-  ];
-in
-rec {
-  src = a.fetchUrlFromSrcInfo s;
+{ stdenv, fetchurl, pciutils, libx86, zlib }:
 
-  inherit (s) name;
-  inherit buildInputs;
-  configureFlags = [];
+stdenv.mkDerivation rec {
+  name = "vbetool-${version}";
+  version = "1.1";
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["fixPCIref" "doConfigure" "doMakeInstall"];
+  src = fetchurl {
+    url = "http://www.codon.org.uk/~mjg59/vbetool/download/${name}.tar.gz";
+    sha256 = "0m7rc9v8nz6w9x4x96maza139kin6lg4hscy6i13fna4672ds9jd";
+  };
 
-  fixPCIref = a.fullDepEntry (''
-    sed -e 's@$(libdir)/libpci.a@${a.pciutils}/lib/libpci.so@' -i Makefile.in
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lpci"
-  '') ["doUnpack" "minInit"];
+  buildInputs = [ pciutils libx86 zlib ];
 
-  meta = {
+  patchPhase = ''
+    substituteInPlace Makefile.in --replace '$(libdir)/libpci.a' ""
+  '';
+
+  configureFlags = [ "LDFLAGS=-lpci" ];
+
+  meta = with stdenv.lib; {
     description = "Video BIOS execution tool";
-    maintainers = [
-      a.lib.maintainers.raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
+    homepage = http://www.codon.org.uk/~mjg59/vbetool/;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/system/vbetool/src-for-default.nix b/pkgs/tools/system/vbetool/src-for-default.nix
deleted file mode 100644
index 97621fd516b..00000000000
--- a/pkgs/tools/system/vbetool/src-for-default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-rec {
-   version="1.1";
-   name="vbetool-1.1";
-   hash="0m7rc9v8nz6w9x4x96maza139kin6lg4hscy6i13fna4672ds9jd";
-   url="http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-${version}.tar.gz";
-   advertisedUrl="http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-1.1.tar.gz";
-  
-  
-}
diff --git a/pkgs/tools/system/vbetool/src-info-for-default.nix b/pkgs/tools/system/vbetool/src-info-for-default.nix
deleted file mode 100644
index 40c721bc490..00000000000
--- a/pkgs/tools/system/vbetool/src-info-for-default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  downloadPage = "http://www.codon.org.uk/~mjg59/vbetool/download/?C=M;O=D";
-  baseName = "vbetool";
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ec1aff8776..d383d165211 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3365,7 +3365,7 @@ let
 
   vidalia = callPackage ../tools/security/vidalia { };
 
-  vbetool = builderDefsPackage (callPackage ../tools/system/vbetool) { };
+  vbetool = callPackage ../tools/system/vbetool { };
 
   vde2 = callPackage ../tools/networking/vde2 { };
 

From 318a0c9f3fb76afd4855709eeba43b48e9bf038b Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 30 Dec 2015 18:56:06 +0100
Subject: [PATCH 12/12] flightgear: use fltk with XFT support

Without XFT the Flight Gear compilation fails with an undefined
reference to `XGetUtf8FontAndGlyph`.
---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d383d165211..3106eaded52 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14068,7 +14068,9 @@ let
 
   fish-fillets-ng = callPackage ../games/fish-fillets-ng {};
 
-  flightgear = qt5.callPackage ../games/flightgear { };
+  flightgear = qt5.callPackage ../games/flightgear {
+    fltk13 = fltk13.override { cfg.xftSupport = true; };
+  };
 
   freecell-solver = callPackage ../games/freecell-solver { };