diff options
Diffstat (limited to 'users')
-rw-r--r-- | users/gkleen@bragi.nix | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/users/gkleen@bragi.nix b/users/gkleen@bragi.nix index 326280f3..57786450 100644 --- a/users/gkleen@bragi.nix +++ b/users/gkleen@bragi.nix | |||
@@ -3,7 +3,7 @@ | |||
3 | mpv = let mpv = pkgs.mpv.override { youtubeSupport = true; theoraSupport = true; }; in pkgs.stdenv.mkDerivation { | 3 | mpv = let mpv = pkgs.mpv.override { youtubeSupport = true; theoraSupport = true; }; in pkgs.stdenv.mkDerivation { |
4 | name = "mpv-wrapper"; | 4 | name = "mpv-wrapper"; |
5 | src = mpv; | 5 | src = mpv; |
6 | unpackPhase = "cat"; | 6 | unpackPhase = "true"; |
7 | buildInputs = [ pkgs.makeWrapper pkgs.rsync ]; | 7 | buildInputs = [ pkgs.makeWrapper pkgs.rsync ]; |
8 | installPhase = '' | 8 | installPhase = '' |
9 | mkdir -p $out | 9 | mkdir -p $out |
@@ -17,7 +17,7 @@ | |||
17 | jackmeter = let jackmeter = pkgs.jackmeter.override {}; in pkgs.stdenv.mkDerivation { | 17 | jackmeter = let jackmeter = pkgs.jackmeter.override {}; in pkgs.stdenv.mkDerivation { |
18 | name = "jackmeter-wrapper"; | 18 | name = "jackmeter-wrapper"; |
19 | src = jackmeter; | 19 | src = jackmeter; |
20 | unpackPhase = "cat"; | 20 | unpackPhase = "true"; |
21 | buildInputs = [ pkgs.makeWrapper pkgs.rsync ]; | 21 | buildInputs = [ pkgs.makeWrapper pkgs.rsync ]; |
22 | installPhase = '' | 22 | installPhase = '' |
23 | mkdir -p $out | 23 | mkdir -p $out |
@@ -28,5 +28,19 @@ | |||
28 | --run "umask 0" | 28 | --run "umask 0" |
29 | ''; | 29 | ''; |
30 | }; | 30 | }; |
31 | myHaskellPackages = pkgs.recurseIntoAttrs { | ||
32 | pkgs.haskellPackages.override { | ||
33 | extension = self: super: let | ||
34 | callPackage = pkgs.lib.callPackageWith self; | ||
35 | in | ||
36 | beuteltier = callPackage custom/beuteltier.nix { fetchgit = pkgs.fetchgit; }; | ||
37 | wombat = callPackage custom/wombat.nix { fetchgit = pkgs.fetchgit; }; | ||
38 | opossum = callPackage custom/opossum.nix { fetchgit = pkgs.fetchgit; }; | ||
39 | opossumWrapper = callPackage custom/opossum-wrapper.nix { | ||
40 | stdenv = pkgs.stdenv; | ||
41 | makeWrapper = pkgs.stdenv.makeWrapper; | ||
42 | }; | ||
43 | }; | ||
44 | }; | ||
31 | }; | 45 | }; |
32 | } | 46 | } |