Merge remote-tracking branch 'lass/master'

1 files changed, 3 insertions, 4 deletions

diff --git a/krebs/5pkgs/simple/htgen-imgur/default.nix b/krebs/5pkgs/simple/htgen-imgur/default.nix
index fe0b2ab0..f429ff7a 100644
--- a/krebs/5pkgs/simple/htgen-imgur/default.nix
+++ b/krebs/5pkgs/simple/htgen-imgur/default.nix
@@ -1,5 +1,4 @@
-with import <stockholm/lib>;
-{ attr, coreutils, exiv2, findutils, gnugrep, jq, nix, utillinux, stdenv }:
+{ attr, coreutils, exiv2, findutils, gnugrep, jq, nix, stockholm, utillinux, stdenv }:
 stdenv.mkDerivation rec {
   pname = "htgen-imgur";
   version = "1.0.0";
@@ -9,7 +8,7 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     (
       exec > htgen-imgur
-      echo PATH=${makeBinPath [
+      echo PATH=${stockholm.lib.makeBinPath [
         attr
         coreutils
         exiv2
@@ -18,7 +17,7 @@ stdenv.mkDerivation rec {
         jq
         nix utillinux
       ]}
-      echo STATEDIR=${shell.escape "\${STATEDIR-$HOME}"}
+      echo STATEDIR=${stockholm.lib.shell.escape "\${STATEDIR-$HOME}"}
       cat $src/htgen-imgur
     )
   '';