diff --git a/pkgs/default.nix b/pkgs/default.nix index afe37375..877c8adb 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -33,7 +33,6 @@ let }; }); guile-config = callPackage ./guile-config.nix { }; - guile-hall = callPackage ./guile-hall.nix { }; hush-shell = callPackage ./hush-shell.nix { }; ictree = callPackage ./ictree.nix { }; kiwmi = callPackage ./kiwmi { }; diff --git a/pkgs/guile-hall.nix b/pkgs/guile-hall.nix deleted file mode 100644 index 2c03e59a..00000000 --- a/pkgs/guile-hall.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ stdenv -, lib -, guile_3_0 -, guile-config -, fetchFromGitLab -, autoreconfHook -, pkg-config -, texinfo -, makeWrapper -}: - -let modules = [ guile-config ]; -in stdenv.mkDerivation rec { - pname = "guile-hall"; - version = "0.4.1"; - - src = fetchFromGitLab { - owner = "a-sassmannshausen"; - repo = pname; - rev = version; - sha256 = "sha256-TUCN8kW44X6iGbSJURurcz/Tc2eCH1xgmXH1sMOMOXs="; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook texinfo makeWrapper ]; - propagatedBuildInputs = [ guile_3_0 ]; - buildInputs = modules; - - postConfigure = '' - sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile - sed -i '/godir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile - sed -i '/ccachedir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile - ''; - - GUILE_LOAD_PATH = - let - guilePath = [ "\${out}/share/guile/site" ] ++ (lib.concatMap - (module: [ - "${module}/share/guile/site" - "${module}/share/guile" - "${module}/share" - ]) - modules); - in - lib.concatStringsSep ":" guilePath; - - GUILE_LOAD_COMPILED_PATH = - let - guilePath = [ "\${out}/share/guile/ccache" "\${out}/share/guile/site" ] - ++ (lib.concatMap - (module: [ - "${module}/share/guile/ccache" - "${module}/share/guile/site" - "${module}/share/guile" - "${module}/share" - ]) - modules); - in - lib.concatStringsSep ":" guilePath; - - postInstall = '' - wrapProgram $out/bin/hall \ - --prefix GUILE_LOAD_PATH : "${GUILE_LOAD_PATH}" \ - --prefix GUILE_LOAD_COMPILED_PATH : "${GUILE_LOAD_COMPILED_PATH}" - ''; - - meta = with lib; { - description = "Command-line application for managing Guile projects"; - homepage = "https://gitlab.com/a-sassmannshausen/guile-hall"; - license = licenses.gpl3Only; - mainProgram = "hall"; - }; -}