diff --git a/pkgs/tools/audio/mpd-mpris/default.nix b/pkgs/tools/audio/mpd-mpris/default.nix index af4000dfa44..b90ab80befd 100644 --- a/pkgs/tools/audio/mpd-mpris/default.nix +++ b/pkgs/tools/audio/mpd-mpris/default.nix @@ -29,6 +29,6 @@ buildGoModule rec { homepage = "https://github.com/natsukagami/mpd-mpris"; license = licenses.mit; maintainers = with maintainers; [ doronbehar ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } 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; }; } diff --git a/pkgs/tools/compression/dejsonlz4/default.nix b/pkgs/tools/compression/dejsonlz4/default.nix index 9e6f95aecb8..07b6a5979a4 100644 --- a/pkgs/tools/compression/dejsonlz4/default.nix +++ b/pkgs/tools/compression/dejsonlz4/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildPhase = '' - gcc -Wall -o dejsonlz4 src/dejsonlz4.c src/lz4.c + ${stdenv.cc.targetPrefix}cc -o dejsonlz4 src/dejsonlz4.c src/lz4.c ''; installPhase = '' @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/avih/dejsonlz4"; license = licenses.bsd2; maintainers = with maintainers; [ mt-caret ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/tools/compression/zdelta/builder.sh b/pkgs/tools/compression/zdelta/builder.sh deleted file mode 100644 index 03db413181d..00000000000 --- a/pkgs/tools/compression/zdelta/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -source $stdenv/setup - -installPhase() { - mkdir -p $out/bin - cp -p zdc zdu $out/bin -} - -genericBuild diff --git a/pkgs/tools/compression/zdelta/default.nix b/pkgs/tools/compression/zdelta/default.nix index 46760c91306..b30a43f33c1 100644 --- a/pkgs/tools/compression/zdelta/default.nix +++ b/pkgs/tools/compression/zdelta/default.nix @@ -1,16 +1,24 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "zdelta-2.1"; - builder = ./builder.sh; + pname = "zdelta"; + version = "2.1"; + src = fetchurl { - url = "${meta.homepage}/downloads/${name}.tar.gz"; - sha256 = "0k6y0r9kv5qiglnr2j4a0yvfynjkvm0pyv8ly28j0pr3w6rbxrh3"; + url = "https://web.archive.org/web/20160316212948/http://cis.poly.edu/zdelta/downloads/zdelta-2.1.tar.gz"; + sha256 = "sha256-WiQKWxJkINIwRBcdiuVLMDiupQ8gOsiXOEZvHDa5iFg="; }; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + + installPhase = '' + mkdir -p $out/bin + cp -p zdc zdu $out/bin + ''; + meta = with lib; { - homepage = "http://cis.poly.edu/zdelta"; - platforms = platforms.linux; + homepage = "https://web.archive.org/web/20160316212948/http://cis.poly.edu/zdelta/"; + platforms = platforms.all; license = licenses.zlib; }; } diff --git a/pkgs/tools/filesystems/catcli/default.nix b/pkgs/tools/filesystems/catcli/default.nix index 1552505701d..be9349daa27 100644 --- a/pkgs/tools/filesystems/catcli/default.nix +++ b/pkgs/tools/filesystems/catcli/default.nix @@ -25,6 +25,6 @@ buildPythonApplication rec { homepage = "https://github.com/deadc0de6/catcli"; license = licenses.gpl3; maintainers = with maintainers; [ petersjt014 ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/tools/filesystems/cpcfs/default.nix b/pkgs/tools/filesystems/cpcfs/default.nix index 2aa63208e00..a439e29358f 100644 --- a/pkgs/tools/filesystems/cpcfs/default.nix +++ b/pkgs/tools/filesystems/cpcfs/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/derikz/cpcfs/" ; license = licenses.bsd2; maintainers = [ ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/tools/filesystems/idsk/default.nix b/pkgs/tools/filesystems/idsk/default.nix index 12a0af7ea4d..0b7ae339053 100644 --- a/pkgs/tools/filesystems/idsk/default.nix +++ b/pkgs/tools/filesystems/idsk/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/cpcsdk/idsk" ; license = licenses.mit; maintainers = [ ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/tools/graphics/epstool/default.nix b/pkgs/tools/graphics/epstool/default.nix index 8052434ff0b..6910f458a17 100644 --- a/pkgs/tools/graphics/epstool/default.nix +++ b/pkgs/tools/graphics/epstool/default.nix @@ -9,6 +9,12 @@ stdenv.mkDerivation rec { sha256 = "1pfgqbipwk36clhma2k365jkpvyy75ahswn8jczzys382jalpwgk"; }; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "CLINK=${stdenv.cc.targetPrefix}cc" + "LINK=${stdenv.cc.targetPrefix}cc" + ]; + installPhase = '' make EPSTOOL_ROOT=$out install ''; @@ -20,6 +26,6 @@ stdenv.mkDerivation rec { homepage = "http://pages.cs.wisc.edu/~ghost/gsview/epstool.htm"; license = licenses.gpl2; maintainers = [ maintainers.asppsa ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/tools/graphics/imgurbash2/default.nix b/pkgs/tools/graphics/imgurbash2/default.nix index 8b79e3373a6..30848d7d0dc 100644 --- a/pkgs/tools/graphics/imgurbash2/default.nix +++ b/pkgs/tools/graphics/imgurbash2/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A shell script that uploads images to imgur"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; homepage = "https://github.com/ram-on/imgurbash2"; }; diff --git a/pkgs/tools/graphics/spirv-cross/default.nix b/pkgs/tools/graphics/spirv-cross/default.nix index cb5a37527bf..19359698f02 100644 --- a/pkgs/tools/graphics/spirv-cross/default.nix +++ b/pkgs/tools/graphics/spirv-cross/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "A tool designed for parsing and converting SPIR-V to other shader languages"; homepage = "https://github.com/KhronosGroup/SPIRV-Cross"; changelog = "https://github.com/KhronosGroup/SPIRV-Cross/releases/tag/${version}"; - platforms = platforms.linux; + platforms = platforms.all; license = licenses.asl20; maintainers = with maintainers; [ Flakebi ]; }; diff --git a/pkgs/tools/misc/apparix/default.nix b/pkgs/tools/misc/apparix/default.nix index 7d8de2c1436..d446a2cf0af 100644 --- a/pkgs/tools/misc/apparix/default.nix +++ b/pkgs/tools/misc/apparix/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "Add directory bookmarks, distant listing, and distant editing to the command line"; maintainers = with maintainers; [ lethalman ]; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/bash_unit/default.nix b/pkgs/tools/misc/bash_unit/default.nix index 2fd93cb33b9..7541281eeb6 100644 --- a/pkgs/tools/misc/bash_unit/default.nix +++ b/pkgs/tools/misc/bash_unit/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Bash unit testing enterprise edition framework for professionals"; maintainers = with maintainers; [ pamplemousse ]; - platforms = platforms.linux; + platforms = platforms.all; license = licenses.gpl3Plus; }; } diff --git a/pkgs/tools/misc/bbe/default.nix b/pkgs/tools/misc/bbe/default.nix index fb62b8be894..5cd7326d7b1 100644 --- a/pkgs/tools/misc/bbe/default.nix +++ b/pkgs/tools/misc/bbe/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { description = "A sed-like editor for binary files"; homepage = "http://bbe-.sourceforge.net/"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.hhm ]; }; } diff --git a/pkgs/tools/misc/bcunit/default.nix b/pkgs/tools/misc/bcunit/default.nix index bc3bbc8276d..099ae294bec 100644 --- a/pkgs/tools/misc/bcunit/default.nix +++ b/pkgs/tools/misc/bcunit/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.linphone.org/BC/public/bcunit"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ raskin jluttine ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/git-fire/default.nix b/pkgs/tools/misc/git-fire/default.nix index bba1bd65a54..15dc34cd526 100644 --- a/pkgs/tools/misc/git-fire/default.nix +++ b/pkgs/tools/misc/git-fire/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ''; homepage = "https://github.com/qw3rtman/git-fire"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.swflint ]; }; } diff --git a/pkgs/tools/misc/ministat/default.nix b/pkgs/tools/misc/ministat/default.nix index 68670599c1e..0cd3ff3a5c1 100644 --- a/pkgs/tools/misc/ministat/default.nix +++ b/pkgs/tools/misc/ministat/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = "https://git.decadent.org.uk/gitweb/?p=ministat.git"; license = licenses.beerware; maintainers = [ maintainers.dezgeg ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/sfeed/default.nix b/pkgs/tools/misc/sfeed/default.nix index 57e49c88745..93ef69ea2ea 100644 --- a/pkgs/tools/misc/sfeed/default.nix +++ b/pkgs/tools/misc/sfeed/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { ''; license = licenses.isc; maintainers = [ maintainers.matthiasbeyer ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/vimer/default.nix b/pkgs/tools/misc/vimer/default.nix index 1fbb85f0751..bbab2d64bb0 100644 --- a/pkgs/tools/misc/vimer/default.nix +++ b/pkgs/tools/misc/vimer/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; maintainers = [ maintainers.matthiasbeyer ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix index c28df461459..703af40864a 100644 --- a/pkgs/tools/networking/altermime/default.nix +++ b/pkgs/tools/networking/altermime/default.nix @@ -1,12 +1,11 @@ -{ lib, stdenv, fetchurl }: +{ lib, gccStdenv, fetchurl }: -stdenv.mkDerivation rec { - baseName = "altermime"; - name = "${baseName}-${version}"; +gccStdenv.mkDerivation rec { + pname = "altermime"; version = "0.3.11"; src = fetchurl { - url = "https://pldaniels.com/${baseName}/${name}.tar.gz"; + url = "https://pldaniels.com/${pname}/${pname}-${version}.tar.gz"; sha256 = "15zxg6spcmd35r6xbidq2fgcg2nzyv1sbbqds08lzll70mqx4pj7"; }; @@ -19,14 +18,14 @@ stdenv.mkDerivation rec { ]; postPatch = '' - sed -i Makefile -e "s@/usr/local@$out@" - mkdir -p "$out/bin" + mkdir -p $out/bin + substituteInPlace Makefile --replace "/usr/local" "$out" ''; meta = with lib; { description = "MIME alteration tool"; maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; + platforms = platforms.all; license.fullName = "alterMIME LICENSE"; downloadPage = "https://pldaniels.com/altermime/"; }; diff --git a/pkgs/tools/networking/dhcping/default.nix b/pkgs/tools/networking/dhcping/default.nix index d4255d46096..f1f8cd8b5e4 100644 --- a/pkgs/tools/networking/dhcping/default.nix +++ b/pkgs/tools/networking/dhcping/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.mavetju.org/unix/general.php"; license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/httperf/default.nix b/pkgs/tools/networking/httperf/default.nix index f5c888dc4bb..ea567f10d48 100644 --- a/pkgs/tools/networking/httperf/default.nix +++ b/pkgs/tools/networking/httperf/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/httperf/httperf"; maintainers = with maintainers; [ nand0p ]; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.all; }; }