diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-05-27 17:44:08 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-05-27 17:44:08 +0200 |
| commit | b22cc53db147cdbfe84ffbc344143bf1e8c1e515 (patch) | |
| tree | d17f8e64fd312018c710405c48ee5d25a035dbd5 /pkgs/applications/graphics | |
| parent | d90eea8cff60490249a614813a76ddd8afa517f8 (diff) | |
| parent | dac633fc37bf8a699e81747cc819b78be4426ae5 (diff) | |
| download | nixlib-b22cc53db147cdbfe84ffbc344143bf1e8c1e515.tar nixlib-b22cc53db147cdbfe84ffbc344143bf1e8c1e515.tar.gz nixlib-b22cc53db147cdbfe84ffbc344143bf1e8c1e515.tar.bz2 nixlib-b22cc53db147cdbfe84ffbc344143bf1e8c1e515.tar.lz nixlib-b22cc53db147cdbfe84ffbc344143bf1e8c1e515.tar.xz nixlib-b22cc53db147cdbfe84ffbc344143bf1e8c1e515.tar.zst nixlib-b22cc53db147cdbfe84ffbc344143bf1e8c1e515.zip | |
Merge staging into master
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/graphics/gimp/plugins/default.nix | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 4bbc34bb7bb6..4b8d2ab291b7 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -78,6 +78,8 @@ stdenv.mkDerivation rec { [ libX11 libXext libXt libwebp ] ; + doCheck = false; # fails 6 out of 76 tests + postInstall = '' (cd "$dev/include" && ln -s ImageMagick* ImageMagick) moveToOutput "bin/*-config" "$dev" diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 5b21b349764b..0c753498af34 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -22,9 +22,8 @@ let ''; } // a - # don't call this gimp-* unless you want nix replace gimp by a plugin :-) // { - name = "${a.name}-${gimp.name}-plugin"; + name = "gimp-plugin-${a.name}"; buildInputs = [ gimp gimp.gtk glib ] ++ (a.buildInputs or []); nativeBuildInputs = [ pkgconfig intltool ] ++ (a.nativeBuildInputs or []); } |