bwbasic: darwin build fix, derivation cleanup / RFC format (NixOS#336730

)
khaneliman · Sep 2, 2024 · e4a2b78 · e4a2b78
2 parents 9d4bada + 5e0698d
commit e4a2b78
Showing 1 changed file with 20 additions and 11 deletions.
diff --git a/pkgs/development/interpreters/bwbasic/default.nix b/pkgs/development/interpreters/bwbasic/default.nix
@@ -1,15 +1,24 @@
-{ lib, stdenv, dos2unix, fetchurl, unzip }:
-
-stdenv.mkDerivation rec {
+{
+  lib,
+  gccStdenv,
+  dos2unix,
+  fetchurl,
+  unzip,
+}:
+
+gccStdenv.mkDerivation (finalAttrs: {
   pname = "bwbasic";
   version = "3.20";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/bwbasic/bwbasic/version%203.20/bwbasic-3.20.zip";
-    sha256 = "1w9r4cl7z1lh52c1jpjragbspi1qn0zb7jhcsldav4gdnzxfw67f";
+    url = "mirror://sourceforge/project/bwbasic/bwbasic/version%20${finalAttrs.version}/bwbasic-${finalAttrs.version}.zip";
+    hash = "sha256-7hju+rftka0a1QzKsz6wOMSr11NZXhmYKJCGfygjOfE=";
   };
 
-  nativeBuildInputs = [ dos2unix unzip ];
+  nativeBuildInputs = [
+    dos2unix
+    unzip
+  ];
 
   unpackPhase = ''
     unzip $src
@@ -27,12 +36,12 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Bywater BASIC Interpreter";
     mainProgram = "bwbasic";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ irenes ];
-    platforms = platforms.all;
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ irenes ];
+    platforms = lib.platforms.all;
     homepage = "https://sourceforge.net/projects/bwbasic/";
   };
-}
+})