diff options
| author | John Wiegley <johnw@newartisans.com> | 2014-12-17 12:11:30 -0600 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2014-12-26 11:06:21 -0600 |
| commit | 28b6fb61e651a3e2cca57d087781e7ba6ab45e7c (patch) | |
| tree | 1931763370f483739474ebe0ab219eb0d7256c13 /pkgs/applications/video | |
| parent | ce100a5d58799e65684ad948db70638c311369b3 (diff) | |
| download | nixpkgs-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar nixpkgs-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.gz nixpkgs-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.bz2 nixpkgs-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.lz nixpkgs-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.xz nixpkgs-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.zst nixpkgs-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.zip | |
Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet this change is also compatible with Linux.
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/makemkv/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/applications/video/makemkv/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/video/makemkv/builder.sh b/pkgs/applications/video/makemkv/builder.sh index 0f5f853c28d..416d5c0f0b0 100644 --- a/pkgs/applications/video/makemkv/builder.sh +++ b/pkgs/applications/video/makemkv/builder.sh @@ -27,7 +27,7 @@ libPath="${libPath}:${out}/lib" # XXX: der. This should be in the nix file? for i in ${bin} ; do patchelf \ - --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libPath \ ${i} done diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 9f360e964af..83fe8c70474 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { buildInputs = [openssl qt4 mesa zlib pkgconfig libav]; - libPath = stdenv.lib.makeLibraryPath [stdenv.gcc.gcc openssl mesa qt4 zlib ] - + ":" + stdenv.gcc.gcc + "/lib64"; + libPath = stdenv.lib.makeLibraryPath [stdenv.cc.gcc openssl mesa qt4 zlib ] + + ":" + stdenv.cc.gcc + "/lib64"; meta = with stdenv.lib; { description = "convert blu-ray and dvd to mkv"; |