diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2015-06-17 14:57:40 +0200 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2015-06-17 14:57:40 +0200 |
| commit | 571cae88e8beaebaa46407bfe855830299ff72fe (patch) | |
| tree | 0193348bb3143de1c0a0aaa30b567b738c7f14bb /users | |
| parent | c8e5cd05b1ac765a09f1a8dfd310c576a2e4ae64 (diff) | |
| download | nixos-571cae88e8beaebaa46407bfe855830299ff72fe.tar nixos-571cae88e8beaebaa46407bfe855830299ff72fe.tar.gz nixos-571cae88e8beaebaa46407bfe855830299ff72fe.tar.bz2 nixos-571cae88e8beaebaa46407bfe855830299ff72fe.tar.xz nixos-571cae88e8beaebaa46407bfe855830299ff72fe.zip | |
moved runOpossum out of haskellPackages
Diffstat (limited to 'users')
| -rw-r--r-- | users/gkleen@bragi.nix | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/users/gkleen@bragi.nix b/users/gkleen@bragi.nix index b749c548..aab73f7b 100644 --- a/users/gkleen@bragi.nix +++ b/users/gkleen@bragi.nix | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | { | 1 | rec { |
| 2 | packageOverrides = pkgs: { | 2 | packageOverrides = pkgs: { |
| 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"; |
| @@ -57,17 +57,12 @@ | |||
| 57 | --prefix PATH : ${pkgs.youtube-dl}/bin | 57 | --prefix PATH : ${pkgs.youtube-dl}/bin |
| 58 | ''; | 58 | ''; |
| 59 | }; | 59 | }; |
| 60 | runOpossum = callPackage ../custom/run-opossum_bragi.nix { | ||
| 61 | stdenv = pkgs.stdenv; | ||
| 62 | zsh = pkgs.zsh; | ||
| 63 | findutils = pkgs.findutils; | ||
| 64 | coreutils = pkgs.coreutils; | ||
| 65 | wombat = self.wombatWrapper; | ||
| 66 | opossum = self.opossumWrapper; | ||
| 67 | makeWrapper = pkgs.makeWrapper; | ||
| 68 | }; | ||
| 69 | }; | 60 | }; |
| 70 | } | 61 | } |
| 71 | ); | 62 | ); |
| 63 | runOpossum = pkgs.callPackage ../custom/run-opossum_bragi.nix { | ||
| 64 | wombat = myHaskellPackages.wombatWrapper; | ||
| 65 | opossum = myHaskellPackages.opossumWrapper; | ||
| 66 | }; | ||
| 72 | }; | 67 | }; |
| 73 | } | 68 | } |
