diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-03-19 00:41:01 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-19 00:41:01 +0000 |
commit | d73a492e831d91dc62f97132e3e545bb9247dfc8 (patch) | |
tree | cfbc3be5512b1fe65c5db7c880b5c83eed7cf600 /pkgs/tools/cd-dvd | |
parent | 8497314b8eaee8b43e06c79f02e9d3ac65a94336 (diff) | |
parent | aea8bbde8da0a9279d832f6fbd3afd916f972957 (diff) | |
download | nixpkgs-d73a492e831d91dc62f97132e3e545bb9247dfc8.tar nixpkgs-d73a492e831d91dc62f97132e3e545bb9247dfc8.tar.gz nixpkgs-d73a492e831d91dc62f97132e3e545bb9247dfc8.tar.bz2 nixpkgs-d73a492e831d91dc62f97132e3e545bb9247dfc8.tar.lz nixpkgs-d73a492e831d91dc62f97132e3e545bb9247dfc8.tar.xz nixpkgs-d73a492e831d91dc62f97132e3e545bb9247dfc8.tar.zst nixpkgs-d73a492e831d91dc62f97132e3e545bb9247dfc8.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/cd-dvd')
-rw-r--r-- | pkgs/tools/cd-dvd/cdi2iso/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/tools/cd-dvd/cdi2iso/default.nix b/pkgs/tools/cd-dvd/cdi2iso/default.nix index 9df7ab7657f..26768747a46 100644 --- a/pkgs/tools/cd-dvd/cdi2iso/default.nix +++ b/pkgs/tools/cd-dvd/cdi2iso/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "cdi2iso"; @@ -9,9 +9,13 @@ stdenv.mkDerivation rec { sha256 = "0fj2fxhpr26z649m0ph71378c41ljflpyk89g87x8r1mc4rbq3kh"; }; + postPatch = '' + substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc" + ''; + installPhase = '' - mkdir -p $out/bin/ - cp cdi2iso $out/bin/ + mkdir -p $out/bin + cp cdi2iso $out/bin ''; meta = with lib; { @@ -19,6 +23,6 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/cdi2iso.berlios"; license = licenses.gpl2; maintainers = with maintainers; [ hrdinka ]; - platforms = platforms.linux; + platforms = platforms.all; }; } |