Merge remote-tracking branch 'nixpkgs/nixos-unstable'

3 files changed, 2 insertions, 62 deletions

diff --git a/nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix
index 1262cd73f670..1e5ddbd49143 100644
--- a/nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix
+++ b/nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://www.nongnu.org/guile-lib/";
-    description = "A collection of useful Guile Scheme modules";
+    description = "Collection of useful Guile Scheme modules";
     longDescription = ''
       guile-lib is intended as an accumulation place for pure-scheme Guile
       modules, allowing for people to cooperate integrating their generic Guile
diff --git a/nixpkgs/pkgs/development/guile-modules/guile-reader/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-reader/default.nix
index fcb6e8c7a8a5..2a9d20f9aefa 100644
--- a/nixpkgs/pkgs/development/guile-modules/guile-reader/default.nix
+++ b/nixpkgs/pkgs/development/guile-modules/guile-reader/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://www.nongnu.org/guile-reader/";
-    description = "A simple framework for building readers for GNU Guile";
+    description = "Simple framework for building readers for GNU Guile";
     longDescription = ''
        Guile-Reader is a simple framework for building readers for GNU Guile.
 
diff --git a/nixpkgs/pkgs/development/guile-modules/guile-sdl/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-sdl/default.nix
deleted file mode 100644
index 75ca3d8e4aa4..000000000000
--- a/nixpkgs/pkgs/development/guile-modules/guile-sdl/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, guile
-, lzip
-, pkg-config
-, SDL
-, SDL_image
-, SDL_mixer
-, SDL_ttf
-, buildEnv
-}:
-
-stdenv.mkDerivation rec {
-  pname = "guile-sdl";
-  version = "0.6.1";
-
-  src = fetchurl {
-    url = "mirror://gnu/${pname}/${pname}-${version}.tar.lz";
-    hash = "sha256-/9sTTvntkRXck3FoRalROjqUQC8hkePtLTnHNZotKOE=";
-  };
-
-  strictDeps = true;
-
-  nativeBuildInputs = [
-    guile
-    lzip
-    pkg-config
-    SDL
-  ];
-
-  buildInputs = [
-    guile
-    (lib.getDev SDL)
-    SDL_image
-    SDL_mixer
-    SDL_ttf
-  ];
-
-  makeFlags =
-    let
-      sdl-env = buildEnv {
-        name = "sdl-env";
-        paths = buildInputs;
-      };
-    in
-    [
-      "SDLMINUSI=-I${sdl-env}/include/SDL"
-    ];
-
-  meta = with lib; {
-    homepage = "https://www.gnu.org/software/guile-sdl/";
-    description = "Guile bindings for SDL";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ vyp ];
-    platforms = guile.meta.platforms;
-    # configure: error: *** SDL version  not found!
-    broken = stdenv.isDarwin;
-  };
-}