diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-05-29 08:38:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-29 08:38:21 +0000 |
| commit | 97aba37876c4513102b0acef05f3438c0b896840 (patch) | |
| tree | a5588fe46f892687b80e2c782ba9cb3834f7f50f /pkgs/applications/misc | |
| parent | 3dbb0207738e9102dacfb1bc60d455ef204759be (diff) | |
| parent | 36a6746f2178141465761ce36de888389bc2968a (diff) | |
| download | nixlib-97aba37876c4513102b0acef05f3438c0b896840.tar nixlib-97aba37876c4513102b0acef05f3438c0b896840.tar.gz nixlib-97aba37876c4513102b0acef05f3438c0b896840.tar.bz2 nixlib-97aba37876c4513102b0acef05f3438c0b896840.tar.lz nixlib-97aba37876c4513102b0acef05f3438c0b896840.tar.xz nixlib-97aba37876c4513102b0acef05f3438c0b896840.tar.zst nixlib-97aba37876c4513102b0acef05f3438c0b896840.zip | |
Merge pull request #61657 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/dmenu/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/misc/fsv/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/misc/pdfmod/default.nix | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index 90754b8fb1d8..e6b62817b907 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk ''; + makeFlags = [ "CC:=$(CC)" ]; + meta = with stdenv.lib; { description = "A generic, highly customizable, and efficient menu for the X Window System"; homepage = https://tools.suckless.org/dmenu; diff --git a/pkgs/applications/misc/fsv/default.nix b/pkgs/applications/misc/fsv/default.nix index 782a37040d8f..152078065395 100644 --- a/pkgs/applications/misc/fsv/default.nix +++ b/pkgs/applications/misc/fsv/default.nix @@ -4,10 +4,10 @@ let gtkglarea = stdenv.mkDerivation rec { - name = "gtkglarea-${version}"; + pname = "gtkglarea"; version = "2.1.0"; src = fetchurl { - url = "mirror://gnome/sources/gtkglarea/2.1/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1pl2vdj6l64j864ilhkq1bcggb3hrlxjwk5m029i7xfjfxc587lf"; }; nativeBuildInputs = [ pkgconfig ]; @@ -16,13 +16,13 @@ let }; in stdenv.mkDerivation rec { - name = "fsv-${version}"; + pname = "fsv"; version = "0.9-1"; src = fetchFromGitHub { owner = "mcuelenaere"; repo = "fsv"; - rev = name; + rev = "${pname}-${version}"; sha256 = "0n09jd7yqj18mx6zqbg7kab4idg5llr15g6avafj74fpg1h7iimj"; }; diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix index 45d83b5872fa..90107be64c72 100644 --- a/pkgs/applications/misc/pdfmod/default.nix +++ b/pkgs/applications/misc/pdfmod/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "pdfmod-${version}"; + pname = "pdfmod"; version = "0.9.1"; src = fetchurl { - url = "mirror://gnome/sources/pdfmod/0.9/pdfmod-${version}.tar.bz2"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "eb7c987514a053106ddf03f26544766c751c801d87762909b36415d46bc425c9"; }; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { dontStrip = true; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/PdfMod; + homepage = "https://wiki.gnome.org/Attic/PdfMod"; description = "A simple application for modifying PDF documents"; platforms = platforms.all; maintainers = with maintainers; [ obadz ]; |