From 4158f021ff659dd392ff6ff3cc38cb0582989fee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 6 Feb 2021 12:05:44 +0100 Subject: [PATCH] don't use deprecated stdenv.lib --- README.md | 4 ++-- release.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4195d2934..48dbb6b87 100644 --- a/README.md +++ b/README.md @@ -187,7 +187,7 @@ Each repository should return a set of Nix derivations: In this example `hello-nur` would be a directory containing a `default.nix`: ```nix -{ stdenv, fetchurl }: +{ stdenv, fetchurl, lib }: stdenv.mkDerivation rec { pname = "hello"; @@ -205,7 +205,7 @@ stdenv.mkDerivation rec { # fails due to patch doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A program that produces a familiar, friendly greeting"; longDescription = '' GNU Hello is a program that prints "Hello, world!" when you run it. diff --git a/release.nix b/release.nix index a3b995983..5170a8a62 100644 --- a/release.nix +++ b/release.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication { doCheck = true; makeWrapperArgs = [ - "--prefix" "PATH" ":" "${stdenv.lib.makeBinPath [ nix-prefetch-git git nix ]}" + "--prefix" "PATH" ":" "${pkgs.lib.makeBinPath [ nix-prefetch-git git nix ]}" "--set" "LOCALE_ARCHIVE" "${glibcLocales}/lib/locale/locale-archive" ]; }