summary refs log tree commit diff
path: root/pkgs/applications/virtualization/singularity
diff options
context:
space:
mode:
authorBen Siraphob <bensiraphob@gmail.com>2021-01-15 12:42:41 +0700
committerBen Siraphob <bensiraphob@gmail.com>2021-01-15 14:24:03 +0700
commit108bdac3d99b6d94d3740422af5945e510238304 (patch)
treedd91cf11f7c29bbd4542f5bdab986430025c02e2 /pkgs/applications/virtualization/singularity
parent2e34288f0d8cf01eea228c7dbc50af9589b885f3 (diff)
downloadnixpkgs-108bdac3d99b6d94d3740422af5945e510238304.tar
nixpkgs-108bdac3d99b6d94d3740422af5945e510238304.tar.gz
nixpkgs-108bdac3d99b6d94d3740422af5945e510238304.tar.bz2
nixpkgs-108bdac3d99b6d94d3740422af5945e510238304.tar.lz
nixpkgs-108bdac3d99b6d94d3740422af5945e510238304.tar.xz
nixpkgs-108bdac3d99b6d94d3740422af5945e510238304.tar.zst
nixpkgs-108bdac3d99b6d94d3740422af5945e510238304.zip
pkgs/applications: stdenv.lib -> lib
Diffstat (limited to 'pkgs/applications/virtualization/singularity')
-rw-r--r--pkgs/applications/virtualization/singularity/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index 13f84736d9e..6961dcf7b89 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -39,7 +39,7 @@ buildGoPackage rec {
     cd go/src/github.com/sylabs/singularity
 
     patchShebangs .
-    sed -i 's|defaultPath := "[^"]*"|defaultPath := "${stdenv.lib.makeBinPath propagatedBuildInputs}"|' cmd/internal/cli/actions.go
+    sed -i 's|defaultPath := "[^"]*"|defaultPath := "${lib.makeBinPath propagatedBuildInputs}"|' cmd/internal/cli/actions.go
 
     ./mconfig -V ${version} -p $out --localstatedir=/var
 
@@ -59,8 +59,8 @@ buildGoPackage rec {
     chmod 755 $out/libexec/singularity/bin/starter-suid
 
     # Explicitly configure paths in the config file
-    sed -i 's|^# mksquashfs path =.*$|mksquashfs path = ${stdenv.lib.makeBinPath [squashfsTools]}/mksquashfs|' $out/etc/singularity/singularity.conf
-    sed -i 's|^# cryptsetup path =.*$|cryptsetup path = ${stdenv.lib.makeBinPath [cryptsetup]}/cryptsetup|' $out/etc/singularity/singularity.conf
+    sed -i 's|^# mksquashfs path =.*$|mksquashfs path = ${lib.makeBinPath [squashfsTools]}/mksquashfs|' $out/etc/singularity/singularity.conf
+    sed -i 's|^# cryptsetup path =.*$|cryptsetup path = ${lib.makeBinPath [cryptsetup]}/cryptsetup|' $out/etc/singularity/singularity.conf
 
     runHook postInstall
   '';