diff --git a/pkgs/default.nix b/pkgs/default.nix index 6be92c1b..9de7edd8 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -8,9 +8,8 @@ lib.makeScope pkgs.newScope (self: { foodogsquaredLib = import ../lib { inherit pkgs; }; inherit (self.foodogsquaredLib.builders) makeXDGMimeAssociationList makeXDGPortalConfiguration makeXDGDesktopEntry - buildHugoSite; - inherit (self.foodogsquaredLib.fetchers) - fetchInternetArchive; + buildHugoSite buildFDSEnv; + inherit (self.foodogsquaredLib.fetchers) fetchInternetArchive; # My custom packages. awesome-cli = callPackage ./awesome-cli { }; diff --git a/pkgs/speki/default.nix b/pkgs/speki/default.nix index 5daa6fe5..90996c75 100644 --- a/pkgs/speki/default.nix +++ b/pkgs/speki/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , pkg-config , openssl -, alsaLib +, alsa-lib }: rustPlatform.buildRustPackage rec { @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { env.OPENSSL_NO_VENDOR = "1"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl alsaLib ]; + buildInputs = [ openssl alsa-lib ]; # Most of the tests require filesystem access with the home directory so # we'll have to disable them for now. diff --git a/pkgs/tic-80/default.nix b/pkgs/tic-80/default.nix index dee01760..e49ef519 100644 --- a/pkgs/tic-80/default.nix +++ b/pkgs/tic-80/default.nix @@ -5,7 +5,7 @@ , lib , SDL2 , SDL2_sound -, alsaLib +, alsa-lib , cmake , fetchFromGitHub , freeglut @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - alsaLib + alsa-lib freeglut gtk3 libsamplerate diff --git a/pkgs/wzmach/default.nix b/pkgs/wzmach/default.nix index c3f0489d..5d56d5af 100644 --- a/pkgs/wzmach/default.nix +++ b/pkgs/wzmach/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-o9fCiuNTyP4vUoUm9etqdAzUnd7PmXbTm7Zhim0y4rE="; }; - cargoSha256 = "sha256-MknrsJuNMS5BgCbgMuqSPzxyR70y24TGsKMPOuzfkjY="; + cargoHash = "sha256-MknrsJuNMS5BgCbgMuqSPzxyR70y24TGsKMPOuzfkjY="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libinput udev ];