From 215c7bd3cb46ff11665b3cba1397ef22c282b803 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Sun, 4 Dec 2022 21:24:34 +0200 Subject: [PATCH] nix: remove merged hwdata override --- flake.nix | 3 +-- nix/hwdata.nix | 28 ---------------------------- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 nix/hwdata.nix diff --git a/flake.nix b/flake.nix index c34d37c3..6e44eece 100644 --- a/flake.nix +++ b/flake.nix @@ -26,7 +26,6 @@ inherit system; overlays = [ (_: prev: { - hwdata = prev.callPackage ./nix/hwdata.nix {}; libdrm = prev.libdrm.overrideAttrs (old: rec { version = "2.4.114"; src = prev.fetchurl { @@ -75,7 +74,7 @@ default = self.packages.${system}.hyprland; }); - devShells = genSystems (system: rec { + devShells = genSystems (system: { default = pkgsFor.${system}.mkShell.override {stdenv = pkgsFor.${system}.gcc12Stdenv;} { name = "hyprland-shell"; nativeBuildInputs = with pkgsFor.${system}; [ diff --git a/nix/hwdata.nix b/nix/hwdata.nix deleted file mode 100644 index c121ef6f..00000000 --- a/nix/hwdata.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "hwdata"; - version = "0.363"; - - src = fetchFromGitHub { - owner = "vcrhonek"; - repo = "hwdata"; - rev = "v${version}"; - sha256 = "sha256-A6GNrHc/t2SVyAyJWmzQTa+pD9wGESsz7DNruW2kH4s="; - }; - - postPatch = '' - patchShebangs ./configure - ''; - - configureFlags = [ "--datadir=${placeholder "out"}/share" ]; - - doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus) - - meta = { - homepage = "https://github.com/vcrhonek/hwdata"; - description = "Hardware Database, including Monitors, pci.ids, usb.ids, and video cards"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.all; - }; -}