diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/build-support/skaware/build-skaware-package.nix index 9b159a994c80..9e4456a3a151 100644 --- a/pkgs/build-support/skaware/build-skaware-package.nix +++ b/pkgs/build-support/skaware/build-skaware-package.nix @@ -18,12 +18,15 @@ in { , configureFlags # mostly for moving and deleting files from the build directory # : lines -, postInstall +, postInstall ? "" + # : lines +, postFixup ? "" # : list Maintainer , maintainers ? [] - - -}: + # : attrs +, meta ? {} +, ... +} @ args: let @@ -50,16 +53,12 @@ let "README.*" ]; -in stdenv.mkDerivation { - name = "${pname}-${version}"; - +in stdenv.mkDerivation ({ src = fetchurl { url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz"; inherit sha256; }; - inherit outputs; - dontDisableStatic = true; enableParallelBuilding = true; @@ -84,13 +83,11 @@ in stdenv.mkDerivation { noiseFiles = commonNoiseFiles; docFiles = commonMetaFiles; }} $doc/share/doc/${pname} - - ${postInstall} - ''; + '' + postInstall; postFixup = '' ${cleanPackaging.checkForRemainingFiles} - ''; + '' + postFixup; meta = { homepage = "https://skarnet.org/software/${pname}/"; @@ -98,6 +95,9 @@ in stdenv.mkDerivation { license = stdenv.lib.licenses.isc; maintainers = with lib.maintainers; [ pmahoney Profpatsch ] ++ maintainers; - }; + } // meta; -} +} // builtins.removeAttrs args [ + "sha256" "configureFlags" "postInstall" "postFixup" + "meta" "description" "platforms" "maintainers" +])