From 1cfd55fd5fcaed14aeeccfed488167f4c3c3cca9 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 12 Jun 2015 20:09:04 +0200 Subject: moved wombat wrapper to haskellPackages --- users/gkleen@bragi.nix | 30 +++++++++++++++--------------- 1 file 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 @@ attoparsecExpr = callPackage ../custom/attoparsec-expr.nix {}; shellMonad = callPackage ../custom/shell-monad.nix {}; beuteltier = callPackage ../custom/beuteltier.nix { fetchgit = pkgs.fetchgit; }; - wombat = callPackage ../custom/wombat.nix { fetchgit = pkgs.fetchgit; }; opossum = callPackage ../custom/opossum.nix { fetchgit = pkgs.fetchgit; }; opossumWrapper = callPackage ../custom/opossum-wrapper.nix { stdenv = pkgs.stdenv; makeWrapper = pkgs.makeWrapper; }; + wombat = callPackage ../custom/wombat.nix { fetchgit = pkgs.fetchgit; }; + wombatWrapper = pkgs.stdenv.mkDerivation { + name = "wombat-wrapper"; + src = self.wombat; + unpackPhase = "true"; + buildInputs = [ pkgs.makeWrapper pkgs.rsync ]; + installPhase = '' + mkdir -p $out + rsync -a $src/ $out/ + chmod u+w $out/bin + wrapProgram $out/bin/wombat \ + --prefix PATH : ${pkgs.ffmpeg}/bin \ + --prefix PATH : ${pkgs.youtube-dl}/bin + ''; + }; }; } ); - wombatWrapper = pkgs.stdenv.mkDerivation { - name = "wombat-wrapper"; - src = myHaskellPackages.wombat; - unpackPhase = "true"; - buildInputs = [ pkgs.makeWrapper pkgs.rsync ]; - installPhase = '' - mkdir -p $out - rsync -a $src/ $out/ - chmod u+w $out/bin - wrapProgram $out/bin/wombat \ - --prefix PATH : ${pkgs.ffmpeg}/bin \ - --prefix PATH : ${pkgs.youtube-dl}/bin - ''; - }; }; } -- cgit v1.2.3