diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-03 09:00:23 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-03 09:00:23 +0200 |
| commit | 8e97d0be6bf0b381935e3b8429430d645dc2e226 (patch) | |
| tree | c7c981528854fc55a9aed6a2445f4e8172ea9ea0 /pkgs/applications/graphics | |
| parent | 3ad01beda76c038e52e8f4524d5f3c409e0b6e36 (diff) | |
| parent | 25a77b72106922b055d1e1f1883c164d34b17311 (diff) | |
| download | nixlib-8e97d0be6bf0b381935e3b8429430d645dc2e226.tar nixlib-8e97d0be6bf0b381935e3b8429430d645dc2e226.tar.gz nixlib-8e97d0be6bf0b381935e3b8429430d645dc2e226.tar.bz2 nixlib-8e97d0be6bf0b381935e3b8429430d645dc2e226.tar.lz nixlib-8e97d0be6bf0b381935e3b8429430d645dc2e226.tar.xz nixlib-8e97d0be6bf0b381935e3b8429430d645dc2e226.tar.zst nixlib-8e97d0be6bf0b381935e3b8429430d645dc2e226.zip | |
Merge staging into staging-next
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/graphicsmagick/compat.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/graphics/gscan2pdf/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/graphicsmagick/compat.nix b/pkgs/applications/graphics/graphicsmagick/compat.nix index bd1ce2ed893a..fedcafc59788 100644 --- a/pkgs/applications/graphics/graphicsmagick/compat.nix +++ b/pkgs/applications/graphics/graphicsmagick/compat.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "graphicsmagick-imagemagick-compat-${version}"; inherit (graphicsmagick) version; - unpackPhase = "true"; + dontUnpack = true; buildPhase = "true"; utils = [ diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index 191aefbe7efc..7ecee8d6d631 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; perlPackages.buildPerlPackage rec { - name = "gscan2pdf-${version}"; + pname = "gscan2pdf"; version = "2.3.0"; src = fetchurl { - url = "mirror://sourceforge/gscan2pdf/${version}/${name}.tar.xz"; + url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz"; sha256 = "0mcsmly0j9pmyzh6py8r6sfa30hc6gv300hqq3dxj4hv653vhkk9"; }; |