cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #114438 from cole-h/octave-stdenv

Browse source 
octave.pkgs: stdenv.lib -> lib
This commit is contained in:
davidak 2021-02-26 08:06:56 +01:00 committed by GitHub
commit 0b8d4b2932
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/interpreters/octave/build-env.nix
View file

@ -1,4 +1,4 @@
{ stdenv, octave, buildEnv
{ lib, stdenv, octave, buildEnv
, makeWrapper, texinfo
, octavePackages
, wrapOctave
@ -48,7 +48,7 @@ in buildEnv {
createOctavePackagesPath $out ${octave}
for path in ${stdenv.lib.concatStringsSep " " packages}; do
for path in ${lib.concatStringsSep " " packages}; do
if [ -e $path/*.tar.gz ]; then
$out/bin/octave-cli --eval "pkg local_list $out/.octave_packages; \
pkg prefix $out/${octave.octPkgsPath} $out/${octave.octPkgsPath}; \
@ -61,7 +61,7 @@ in buildEnv {
# To point to the new local_list in $out
addPkgLocalList $out ${octave}
wrapOctavePrograms "${stdenv.lib.concatStringsSep " " packages}"
wrapOctavePrograms "${lib.concatStringsSep " " packages}"
'' + postBuild;
inherit (octave) meta;