diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2015-06-12 20:09:04 +0200 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2015-06-12 20:09:04 +0200 |
commit | 1cfd55fd5fcaed14aeeccfed488167f4c3c3cca9 (patch) | |
tree | b12a7f29115f1e68fc8506b5bdb47d46d8852fb0 /users/gkleen@bragi.nix | |
parent | 1cea630b5bd94ed79c9f53f937f7e849b39009e5 (diff) | |
download | nixos-1cfd55fd5fcaed14aeeccfed488167f4c3c3cca9.tar nixos-1cfd55fd5fcaed14aeeccfed488167f4c3c3cca9.tar.gz nixos-1cfd55fd5fcaed14aeeccfed488167f4c3c3cca9.tar.bz2 nixos-1cfd55fd5fcaed14aeeccfed488167f4c3c3cca9.tar.xz nixos-1cfd55fd5fcaed14aeeccfed488167f4c3c3cca9.zip |
moved wombat wrapper to haskellPackages
Diffstat (limited to 'users/gkleen@bragi.nix')
-rw-r--r-- | users/gkleen@bragi.nix | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/users/gkleen@bragi.nix b/users/gkleen@bragi.nix index 47836f7f..e0b50300 100644 --- a/users/gkleen@bragi.nix +++ b/users/gkleen@bragi.nix | |||
@@ -36,28 +36,28 @@ | |||
36 | attoparsecExpr = callPackage ../custom/attoparsec-expr.nix {}; | 36 | attoparsecExpr = callPackage ../custom/attoparsec-expr.nix {}; |
37 | shellMonad = callPackage ../custom/shell-monad.nix {}; | 37 | shellMonad = callPackage ../custom/shell-monad.nix {}; |
38 | beuteltier = callPackage ../custom/beuteltier.nix { fetchgit = pkgs.fetchgit; }; | 38 | beuteltier = callPackage ../custom/beuteltier.nix { fetchgit = pkgs.fetchgit; }; |
39 | wombat = callPackage ../custom/wombat.nix { fetchgit = pkgs.fetchgit; }; | ||
40 | opossum = callPackage ../custom/opossum.nix { fetchgit = pkgs.fetchgit; }; | 39 | opossum = callPackage ../custom/opossum.nix { fetchgit = pkgs.fetchgit; }; |
41 | opossumWrapper = callPackage ../custom/opossum-wrapper.nix { | 40 | opossumWrapper = callPackage ../custom/opossum-wrapper.nix { |
42 | stdenv = pkgs.stdenv; | 41 | stdenv = pkgs.stdenv; |
43 | makeWrapper = pkgs.makeWrapper; | 42 | makeWrapper = pkgs.makeWrapper; |
44 | }; | 43 | }; |
44 | wombat = callPackage ../custom/wombat.nix { fetchgit = pkgs.fetchgit; }; | ||
45 | wombatWrapper = pkgs.stdenv.mkDerivation { | ||
46 | name = "wombat-wrapper"; | ||
47 | src = self.wombat; | ||
48 | unpackPhase = "true"; | ||
49 | buildInputs = [ pkgs.makeWrapper pkgs.rsync ]; | ||
50 | installPhase = '' | ||
51 | mkdir -p $out | ||
52 | rsync -a $src/ $out/ | ||
53 | chmod u+w $out/bin | ||
54 | wrapProgram $out/bin/wombat \ | ||
55 | --prefix PATH : ${pkgs.ffmpeg}/bin \ | ||
56 | --prefix PATH : ${pkgs.youtube-dl}/bin | ||
57 | ''; | ||
58 | }; | ||
45 | }; | 59 | }; |
46 | } | 60 | } |
47 | ); | 61 | ); |
48 | wombatWrapper = pkgs.stdenv.mkDerivation { | ||
49 | name = "wombat-wrapper"; | ||
50 | src = myHaskellPackages.wombat; | ||
51 | unpackPhase = "true"; | ||
52 | buildInputs = [ pkgs.makeWrapper pkgs.rsync ]; | ||
53 | installPhase = '' | ||
54 | mkdir -p $out | ||
55 | rsync -a $src/ $out/ | ||
56 | chmod u+w $out/bin | ||
57 | wrapProgram $out/bin/wombat \ | ||
58 | --prefix PATH : ${pkgs.ffmpeg}/bin \ | ||
59 | --prefix PATH : ${pkgs.youtube-dl}/bin | ||
60 | ''; | ||
61 | }; | ||
62 | }; | 62 | }; |
63 | } | 63 | } |