diff options
| author | makefu <github@syntax-fehler.de> | 2018-06-24 23:43:26 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2018-06-24 23:43:26 +0200 |
| commit | 1b37e5d649f124c6d85fa59d22116e330fe7d032 (patch) | |
| tree | 541efd446c4dc9c5227feb04d432ccc3c4f1e92c /lass/5pkgs | |
| parent | 522148ec0e642b739b79de16aa7fe51832f90a30 (diff) | |
| parent | 9c2584b3c841dc75b1a3a34c252a5a91495d06a2 (diff) | |
Merge branch 'master' of prism:stockholm
Diffstat (limited to 'lass/5pkgs')
| -rw-r--r-- | lass/5pkgs/custom/xmonad-lass/default.nix | 2 | ||||
| -rw-r--r-- | lass/5pkgs/dpass/default.nix | 4 | ||||
| -rw-r--r-- | lass/5pkgs/xephyrify/default.nix | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lass/5pkgs/custom/xmonad-lass/default.nix b/lass/5pkgs/custom/xmonad-lass/default.nix index 868c1072a..7180f2a69 100644 --- a/lass/5pkgs/custom/xmonad-lass/default.nix +++ b/lass/5pkgs/custom/xmonad-lass/default.nix @@ -1,5 +1,5 @@ { config, pkgs, ... }: -pkgs.writeHaskell "xmonad-lass" { +pkgs.writeHaskellPackage "xmonad-lass" { executables.xmonad = { extra-depends = [ "containers" diff --git a/lass/5pkgs/dpass/default.nix b/lass/5pkgs/dpass/default.nix index 7e75d50c7..c1e803bcb 100644 --- a/lass/5pkgs/dpass/default.nix +++ b/lass/5pkgs/dpass/default.nix @@ -1,6 +1,6 @@ -{ pass, writeOut, writeDash, ... }: +{ pass, write, writeDash, ... }: -writeOut "dsco-pass" { +write "dsco-pass" { "/bin/dpass".link = writeDash "dpass" '' PASSWORD_STORE_DIR=$HOME/.dpasswordstore \ exec ${pass}/bin/pass $@ diff --git a/lass/5pkgs/xephyrify/default.nix b/lass/5pkgs/xephyrify/default.nix index 8d6036843..20c546dbb 100644 --- a/lass/5pkgs/xephyrify/default.nix +++ b/lass/5pkgs/xephyrify/default.nix @@ -1,8 +1,8 @@ -{ writeDashBin, writeHaskell, coreutils, xorg, virtualgl, ... }: +{ writeDashBin, writeHaskellPackage, coreutils, xorg, virtualgl, ... }: let - xephyrify-xmonad = writeHaskell "xephyrify-xmonad" { + xephyrify-xmonad = writeHaskellPackage "xephyrify-xmonad" { executables.xmonad = { extra-depends = [ "containers" |