diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-13 20:57:50 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-13 20:57:50 +0200 |
| commit | ded9a4b1aa68b8645271a63e9543ef56177ae642 (patch) | |
| tree | d351102a17ab05c6e263e970f43ab3b30561112e /pkgs/misc | |
| parent | 98df4f635136e63644cb0ab646b55d60cbb444a4 (diff) | |
| parent | 5b0398dc36ce5746d8d54e04a1dfcab25939484a (diff) | |
| download | nixlib-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar nixlib-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.gz nixlib-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.bz2 nixlib-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.lz nixlib-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.xz nixlib-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.zst nixlib-ded9a4b1aa68b8645271a63e9543ef56177ae642.zip | |
Merge branch 'staging-next' into staging
Commits from master, conflict resolutions, etc.
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/brightnessctl/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/misc/emulators/dosbox/unstable.nix | 1 | ||||
| -rw-r--r-- | pkgs/misc/phabricator/default.nix | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/misc/brightnessctl/default.nix b/pkgs/misc/brightnessctl/default.nix index 69fa10d74fe6..b8821d335b26 100644 --- a/pkgs/misc/brightnessctl/default.nix +++ b/pkgs/misc/brightnessctl/default.nix @@ -11,9 +11,10 @@ stdenv.mkDerivation rec { sha256 = "0amxhcikcgj04z81272kz35m5h5q4jx9x7v71h8yl1rv4b2lzh7z"; }; - makeFlags = "MODE=0755 PREFIX=/ DESTDIR=$(out)"; + makeFlags = [ "MODE=0755" "PREFIX=" "DESTDIR=$(out)" ]; + installTargets = [ "install" "install_udev_rules" ]; - patchPhase = '' + postPatch = '' substituteInPlace 90-brightnessctl.rules --replace /bin/ ${coreutils}/bin/ substituteInPlace 90-brightnessctl.rules --replace %k '*' ''; diff --git a/pkgs/misc/emulators/dosbox/unstable.nix b/pkgs/misc/emulators/dosbox/unstable.nix index aecfd7698f07..e1762d66641a 100644 --- a/pkgs/misc/emulators/dosbox/unstable.nix +++ b/pkgs/misc/emulators/dosbox/unstable.nix @@ -36,5 +36,6 @@ in stdenv.mkDerivation rec { description = "A DOS emulator"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ binarin ]; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/misc/phabricator/default.nix b/pkgs/misc/phabricator/default.nix index 367e4e53442e..0dde5b2b6d7c 100644 --- a/pkgs/misc/phabricator/default.nix +++ b/pkgs/misc/phabricator/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.asl20; }; } |