diff options
Diffstat (limited to 'pkgs/build-support/skaware')
-rw-r--r-- | pkgs/build-support/skaware/build-skaware-package.nix | 7 | ||||
-rw-r--r-- | pkgs/build-support/skaware/clean-packaging.nix | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/build-support/skaware/build-skaware-package.nix index e6e2e35789bc..7a5db942b2cb 100644 --- a/pkgs/build-support/skaware/build-skaware-package.nix +++ b/pkgs/build-support/skaware/build-skaware-package.nix @@ -1,6 +1,5 @@ -{ stdenv, cleanPackaging, fetchurl }: -let lib = stdenv.lib; -in { +{ lib, stdenv, cleanPackaging, fetchurl }: +{ # : string pname # : string @@ -98,7 +97,7 @@ in stdenv.mkDerivation { meta = { homepage = "https://skarnet.org/software/${pname}/"; inherit description platforms; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; maintainers = with lib.maintainers; [ pmahoney Profpatsch ] ++ maintainers; }; diff --git a/pkgs/build-support/skaware/clean-packaging.nix b/pkgs/build-support/skaware/clean-packaging.nix index 762fe25c0acf..421d00ad24a7 100644 --- a/pkgs/build-support/skaware/clean-packaging.nix +++ b/pkgs/build-support/skaware/clean-packaging.nix @@ -3,10 +3,10 @@ # files were either discarded or moved to outputs. # This ensures nothing is forgotten and new files # are correctly handled on update. -{ stdenv, file, writeScript }: +{ lib, stdenv, file, writeScript }: let - globWith = stdenv.lib.concatMapStringsSep "\n"; + globWith = lib.concatMapStringsSep "\n"; rmNoise = noiseGlobs: globWith (f: ''rm -rf ${f}'') noiseGlobs; mvDoc = docGlobs: globWith |