pkgs: remove deprecated settings and update fds-lib exports

This commit is contained in:
Gabriel Arazas 2024-10-30 19:32:47 +08:00
parent 5a6aebda86
commit 97875f1b84
No known key found for this signature in database
GPG Key ID: 62104B43D00AA360
4 changed files with 7 additions and 8 deletions

View File

@ -8,9 +8,8 @@ lib.makeScope pkgs.newScope (self: {
foodogsquaredLib = import ../lib { inherit pkgs; }; foodogsquaredLib = import ../lib { inherit pkgs; };
inherit (self.foodogsquaredLib.builders) inherit (self.foodogsquaredLib.builders)
makeXDGMimeAssociationList makeXDGPortalConfiguration makeXDGDesktopEntry makeXDGMimeAssociationList makeXDGPortalConfiguration makeXDGDesktopEntry
buildHugoSite; buildHugoSite buildFDSEnv;
inherit (self.foodogsquaredLib.fetchers) inherit (self.foodogsquaredLib.fetchers) fetchInternetArchive;
fetchInternetArchive;
# My custom packages. # My custom packages.
awesome-cli = callPackage ./awesome-cli { }; awesome-cli = callPackage ./awesome-cli { };

View File

@ -3,7 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, pkg-config , pkg-config
, openssl , openssl
, alsaLib , alsa-lib
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
env.OPENSSL_NO_VENDOR = "1"; env.OPENSSL_NO_VENDOR = "1";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl alsaLib ]; buildInputs = [ openssl alsa-lib ];
# Most of the tests require filesystem access with the home directory so # Most of the tests require filesystem access with the home directory so
# we'll have to disable them for now. # we'll have to disable them for now.

View File

@ -5,7 +5,7 @@
, lib , lib
, SDL2 , SDL2
, SDL2_sound , SDL2_sound
, alsaLib , alsa-lib
, cmake , cmake
, fetchFromGitHub , fetchFromGitHub
, freeglut , freeglut
@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ buildInputs = [
alsaLib alsa-lib
freeglut freeglut
gtk3 gtk3
libsamplerate libsamplerate

View File

@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-o9fCiuNTyP4vUoUm9etqdAzUnd7PmXbTm7Zhim0y4rE="; sha256 = "sha256-o9fCiuNTyP4vUoUm9etqdAzUnd7PmXbTm7Zhim0y4rE=";
}; };
cargoSha256 = "sha256-MknrsJuNMS5BgCbgMuqSPzxyR70y24TGsKMPOuzfkjY="; cargoHash = "sha256-MknrsJuNMS5BgCbgMuqSPzxyR70y24TGsKMPOuzfkjY=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ libinput udev ]; buildInputs = [ libinput udev ];