3 files changed, 4 insertions, 112 deletions
diff --git a/Biz/Bild/Deps/autogen.nix b/Biz/Bild/Deps/autogen.nix
deleted file mode 100644
index fc95b14..0000000
--- a/Biz/Bild/Deps/autogen.nix
+++ /dev/null
@@ -1,107 +0,0 @@
-# From: https://github.com/NixOS/nixpkgs/pull/139361
-{ lib, stdenv, buildPackages, fetchurl, fetchpatch, autoreconfHook, which
-, pkg-config, perl, guile, libxml2 }:
-
-stdenv.mkDerivation rec {
-  pname = "autogen";
-  version = "5.18.16";
-
-  src = fetchurl {
-    url = "mirror://gnu/autogen/rel${version}/autogen-${version}.tar.xz";
-    sha256 = "16mlbdys8q4ckxlvxyhwkdnh1ay9f6g0cyp1kylkpalgnik398gq";
-  };
-
-  patches = let
-    dp = { ver ? "1%255.18.16-4", pname, name ? (pname + ".diff"), sha256 }:
-      fetchurl {
-        url = "https://salsa.debian.org/debian/autogen/-/raw/debian/${ver}"
-          + "/debian/patches/${pname}.diff?inline=false";
-        inherit name sha256;
-      };
-  in [
-    (dp {
-      pname = "20_no_Werror";
-      sha256 = "08z4s2ifiqyaacjpd9pzr59w8m4j3548kkaq1bwvp2gjn29m680x";
-    })
-    (dp {
-      pname = "30_ag_macros.m4_syntax_error";
-      sha256 = "1z8vmbwbkz3505wd33i2xx91mlf8rwsa7klndq37nw821skxwyh3";
-    })
-    (dp {
-      pname = "31_allow_overriding_AGexe_for_crossbuild";
-      sha256 = "0h9wkc9bqb509knh8mymi43hg6n6sxg2lixvjlchcx7z0j7p8xkf";
-    })
-    # Next upstream release will contain guile-3 support. We apply non-invasive
-    # patch meanwhile.
-    (fetchpatch {
-      name = "guile-3.patch";
-      url =
-        "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-devel/autogen/files/autogen-5.18.16-guile-3.patch?id=43bcc61c56a5a7de0eaf806efec7d8c0e4c01ae7";
-      sha256 = "18d7y1f6164dm1wlh7rzbacfygiwrmbc35a7qqsbdawpkhydm5lr";
-    })
-  ];
-
-  outputs = [ "bin" "dev" "lib" "out" "man" "info" ];
-
-  nativeBuildInputs = [
-    which
-    pkg-config
-    perl
-    autoreconfHook # patches applied
-  ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-    # autogen needs a build autogen when cross-compiling
-    buildPackages.buildPackages.autogen
-    buildPackages.texinfo
-  ];
-  buildInputs = [ guile libxml2 ];
-
-  preConfigure = ''
-    export MAN_PAGE_DATE=$(date '+%Y-%m-%d' -d "@$SOURCE_DATE_EPOCH")
-  '';
-
-  configureFlags = [
-    # Make sure to use a static value for the timeout. If we do not set a value
-    # here autogen will select one based on the execution time of the configure
-    # phase which is not really reproducible.
-    #
-    # If you are curious about the number 78, it has been cargo-culted from
-    # Debian: https://salsa.debian.org/debian/autogen/-/blob/master/debian/rules#L21
-    "--enable-timeout=78"
-  ] ++ (lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-    "--with-libxml2=${libxml2.dev}"
-    "--with-libxml2-cflags=-I${libxml2.dev}/include/libxml2"
-    # the configure check for regcomp wants to run a host program
-    "libopts_cv_with_libregex=yes"
-    #"MAKEINFO=${buildPackages.texinfo}/bin/makeinfo"
-  ])
-  # See: https://sourceforge.net/p/autogen/bugs/187/
-    ++ lib.optionals stdenv.isDarwin [ "ac_cv_func_utimensat=no" ];
-
-  #doCheck = true; # not reliable
-
-  postInstall = ''
-    mkdir -p $dev/bin
-    mv $bin/bin/autoopts-config $dev/bin
-
-    for f in $lib/lib/autogen/tpl-config.tlib $out/share/autogen/tpl-config.tlib; do
-      sed -e "s|$dev/include|/no-such-autogen-include-path|" -i $f
-      sed -e "s|$bin/bin|/no-such-autogen-bin-path|" -i $f
-      sed -e "s|$lib/lib|/no-such-autogen-lib-path|" -i $f
-    done
-
-  '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-    # remove /build/** from RPATHs
-    for f in "$bin"/bin/*; do
-      local nrp="$(patchelf --print-rpath "$f" | sed -E 's@(:|^)/build/[^:]*:@\1@g')"
-      patchelf --set-rpath "$nrp" "$f"
-    done
-  '';
-
-  meta = with lib; {
-    description = "Automated text and program generation tool";
-    license = with licenses; [ gpl3Plus lgpl3Plus ];
-    homepage = "https://www.gnu.org/software/autogen/";
-    platforms = platforms.all;
-    maintainers = [ ];
-  };
-}
diff --git a/Biz/Bild/Deps/guile-opengl.nix b/Biz/Bild/Deps/guile-opengl.nix
index d547042..af01082 100644
--- a/Biz/Bild/Deps/guile-opengl.nix
+++ b/Biz/Bild/Deps/guile-opengl.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, pkgconfig, guile, libGL, libGLU, freeglut }:
+{ stdenv, lib, fetchurl, pkg-config, guile, libGL, libGLU, freeglut }:
 
 let
   name = "guile-opengl-${version}";
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
       --replace '(dynamic-link "libglut")' '(dynamic-link "${freeglut}/lib/libglut.so")'
   '';
 
-  nativeBuildInputs = [ pkgconfig guile libGL libGLU freeglut ];
+  nativeBuildInputs = [ pkg-config guile libGL libGLU freeglut ];
 
   meta = with lib; {
     description = "Guile bindings for the OpenGL graphics API";
diff --git a/Biz/Bild/Deps/inspekt3d.nix b/Biz/Bild/Deps/inspekt3d.nix
index d1cf60e..a9dac3d 100644
--- a/Biz/Bild/Deps/inspekt3d.nix
+++ b/Biz/Bild/Deps/inspekt3d.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, autoreconfHook, pkgconfig, guile, guile-opengl, mesa
+{ stdenv, lib, autoreconfHook, pkg-config, guile, guile-opengl, mesa
 , glibcLocales, libfive, sources }:
 
 stdenv.mkDerivation {
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   src = sources.inspekt3d;
   version = "unstable-2018-10-17";
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  nativeBuildInputs = [ pkg-config autoreconfHook ];
   buildInputs = [ guile glibcLocales mesa ];
   propagatedBuildInputs = [ guile-opengl libfive ];
 
@@ -28,4 +28,3 @@ stdenv.mkDerivation {
     platforms = platforms.all;
   };
 }
-