summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2015-06-17 14:49:58 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2015-06-17 14:49:58 +0200
commitf4892b12439b245b6a4ef330b12a8282377e9425 (patch)
tree563035b5dacb6d6026223b5b687083d6f7784a5e
parent1f53a18175e3f6ad34d3b97293434171d67183cb (diff)
downloadnixos-f4892b12439b245b6a4ef330b12a8282377e9425.tar
nixos-f4892b12439b245b6a4ef330b12a8282377e9425.tar.gz
nixos-f4892b12439b245b6a4ef330b12a8282377e9425.tar.bz2
nixos-f4892b12439b245b6a4ef330b12a8282377e9425.tar.xz
nixos-f4892b12439b245b6a4ef330b12a8282377e9425.zip
path fix & bin rename
-rw-r--r--custom/run-opossum@bragi.nix6
-rw-r--r--users/gkleen@bragi.nix2
2 files changed, 4 insertions, 4 deletions
diff --git a/custom/run-opossum@bragi.nix b/custom/run-opossum@bragi.nix
index b1ef30c7..bc8e4bb0 100644
--- a/custom/run-opossum@bragi.nix
+++ b/custom/run-opossum@bragi.nix
@@ -48,13 +48,13 @@ stdenv.mkDerivation {
48 "installPhase" 48 "installPhase"
49 ]; 49 ];
50 buildPhase = '' 50 buildPhase = ''
51 cp -prd --no-preserve=timestamps $src run-opossum.sh 51 cp -prd --no-preserve=timestamps $src run-opossum
52 ''; 52 '';
53 installPhase = '' 53 installPhase = ''
54 mkdir -p $out/bin 54 mkdir -p $out/bin
55 cp run-opossum.sh $out/bin 55 cp run-opossum.sh $out/bin
56 chmod +x $out/bin/run-opossum.sh 56 chmod +x $out/bin/run-opossum
57 wrapProgram $out/bin/run-opossum.sh \ 57 wrapProgram $out/bin/run-opossum \
58 --prefix PATH : ${wombat}/bin \ 58 --prefix PATH : ${wombat}/bin \
59 --prefix PATH : ${opossum}/bin \ 59 --prefix PATH : ${opossum}/bin \
60 --prefix PATH : ${findutils}/bin \ 60 --prefix PATH : ${findutils}/bin \
diff --git a/users/gkleen@bragi.nix b/users/gkleen@bragi.nix
index eaa45493..90c70422 100644
--- a/users/gkleen@bragi.nix
+++ b/users/gkleen@bragi.nix
@@ -57,7 +57,7 @@
57 --prefix PATH : ${pkgs.youtube-dl}/bin 57 --prefix PATH : ${pkgs.youtube-dl}/bin
58 ''; 58 '';
59 }; 59 };
60 runOpossum = with pkgs; callPackage "../custom/run-opossum@bragi.nix" {}; 60 runOpossum = with pkgs; callPackage ../custom/run-opossum@bragi.nix {};
61 }; 61 };
62 } 62 }
63 ); 63 );