From 4a7f99d55d299453a9c2397f90b33d1120669775 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 11 Jan 2021 08:54:33 +0100 Subject: treewide: with stdenv.lib; in meta -> with lib; MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Part of: https://github.com/NixOS/nixpkgs/issues/108938 meta = with stdenv.lib; is a widely used pattern. We want to slowly remove the `stdenv.lib` indirection and encourage people to use `lib` directly. Thus let’s start with the meta field. This used a rewriting script to mostly automatically replace all occurances of this pattern, and add the `lib` argument to the package header if it doesn’t exist yet. The script in its current form is available at https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix --- pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/linux/firmware/openelec-dvb-firmware') diff --git a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix index ff0081a71e1..3181072ea18 100644 --- a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "openelec-dvb-firmware"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { find $out \( -name 'README.*' -or -name 'LICEN[SC]E.*' -or -name '*.txt' \) | xargs rm ''; - meta = with stdenv.lib; { + meta = with lib; { description = "DVB firmware from OpenELEC"; homepage = "https://github.com/OpenELEC/dvb-firmware"; license = licenses.unfreeRedistributableFirmware; -- cgit 1.4.1 From b545f2ddb4752fb0b3cfbedfbcce94a16d944a35 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 26 Jul 2021 20:22:37 +0200 Subject: openelec-dvb-firmware: remove phases --- pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/linux/firmware/openelec-dvb-firmware') diff --git a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix index 3181072ea18..4ef9370c844 100644 --- a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix @@ -9,11 +9,13 @@ stdenv.mkDerivation rec { sha256 = "cef3ce537d213e020af794cecf9de207e2882c375ceda39102eb6fa2580bad8d"; }; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' + runHook preInstall + DESTDIR="$out" ./install find $out \( -name 'README.*' -or -name 'LICEN[SC]E.*' -or -name '*.txt' \) | xargs rm + + runHook postInstall ''; meta = with lib; { -- cgit 1.4.1