diff options
| author | erdnaxe <erdnaxe@users.noreply.github.com> | 2022-10-04 15:32:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-04 15:32:21 +0200 |
| commit | a2c41adf739aaef0e0b3fd81a36b498c08db1291 (patch) | |
| tree | 3a70f07e06a1a151026557b8b29cd085d130af8f /pkgs/tools/graphics | |
| parent | d27df0969e2512159cf528c51cb0ae72921a33b1 (diff) | |
| download | nixpkgs-a2c41adf739aaef0e0b3fd81a36b498c08db1291.tar nixpkgs-a2c41adf739aaef0e0b3fd81a36b498c08db1291.tar.gz nixpkgs-a2c41adf739aaef0e0b3fd81a36b498c08db1291.tar.bz2 nixpkgs-a2c41adf739aaef0e0b3fd81a36b498c08db1291.tar.lz nixpkgs-a2c41adf739aaef0e0b3fd81a36b498c08db1291.tar.xz nixpkgs-a2c41adf739aaef0e0b3fd81a36b498c08db1291.tar.zst nixpkgs-a2c41adf739aaef0e0b3fd81a36b498c08db1291.zip | |
cfdg: remove src-for-default.nix, cleanups (#192727)
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/cfdg/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/tools/graphics/cfdg/src-for-default.nix | 9 |
2 files changed, 7 insertions, 11 deletions
diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix index 44a1e0d1d2a..fd4a8b366fe 100644 --- a/pkgs/tools/graphics/cfdg/default.nix +++ b/pkgs/tools/graphics/cfdg/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "13m8npccacmgxbs4il45zw53dskjh53ngv2nxahwqw8shjrws4mh"; }; - buildInputs = [ libpng bison flex ffmpeg icu ]; + nativeBuildInputs = [ bison flex ]; + buildInputs = [ libpng ffmpeg icu ]; postPatch = '' sed -e "/YY_NO_UNISTD/a#include <stdio.h>" -i src-common/cfdg.l @@ -18,11 +19,15 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin cp cfdg $out/bin/ mkdir -p $out/share/doc/${pname}-${version} cp *.txt $out/share/doc/${pname}-${version} + + runHook postInstall ''; meta = with lib; { @@ -30,6 +35,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; homepage = "https://contextfreeart.org/"; - license = licenses.gpl2; + license = licenses.gpl2Only; }; } diff --git a/pkgs/tools/graphics/cfdg/src-for-default.nix b/pkgs/tools/graphics/cfdg/src-for-default.nix deleted file mode 100644 index 7ff076a5b0a..00000000000 --- a/pkgs/tools/graphics/cfdg/src-for-default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - version="3.0.2"; - name="cfdg-3.0.2"; - hash="1pd1hjippbhad8l4s4lsglykh22i24qfrgmnxrsx71bvcqbr356p"; - url="http://www.contextfreeart.org/download/ContextFreeSource3.0.2.tgz"; - advertisedUrl="http://www.contextfreeart.org/download/ContextFreeSource3.0.2.tgz"; - - -} |